Merge tag 'v2.1.6' into develop
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 17 Jun 2016 18:14:27 +0000 (14:14 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 17 Jun 2016 18:14:27 +0000 (14:14 -0400)
commitb15fc0445bac112f3e4a3a1a7f32d346e93e477b
tree866b34715ccf1f7aa8a848af9ff2601bcae69cab
parent3a5c2cbc6c63f0ef0362fecf92891b8f688fb152
parent7b7cbfa9fa8b8b957a77be6a9ed6d219a16a1f5f
Merge tag 'v2.1.6' into develop

removed unused code and comments