work on chores + animations
Merge branch 'master' of https://github.com/pcsmits/homebase

Conflicts:
	root/homeBase/res/values/ids.xml
chore info stuff
Merging from upstream
Merge branch 'master' of https://github.com/MaritalWheat/homebase
hooking gps with parse