Commit to mergCommit to mergee
Merge branch 'master' of https://github.com/rob-med/AndroidSRO

Conflicts:
	src/com/sro/activity/LoginFragment.java
	src/com/sro/util/LocationService.java