i like ass
Merge remote-tracking branch 'origin/master'
added fix so google map readjusts size on slide menu