Merge pull request #14 from AppGroup/master

map
oauth tweaking
Merge branch 'master' of https://github.com/AppGroup/Forage-1 into AppGroup-master
button states

added map state