origin/master
Merge branch 'master' of https://github.com/PassionJHack/passion

Conflicts:
	LocationMonitor/.gitignore
	LocationMonitor/.sdk_delta.info
	LocationMonitor/src/LocationListener.cpp