Merge tag 'v1.0.6' into develop
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 27 May 2016 15:05:13 +0000 (11:05 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 27 May 2016 15:05:13 +0000 (11:05 -0400)
swapped footer logo and trip advisor logo


Trivial merge