before merging
Merge branch 'master' of https://github.com/rob-med/AndroidSRO

Conflicts:
	AndroidManifest.xml
	res/layout/activity_home_page.xml
	res/layout/activity_login.xml
	res/values/strings.xml
	src/com/example/semanticroutesorganizer/HomePageActivity.java
	src/com/example/semanticroutesorganizer/LoginActivity.java
	src/com/example/semanticroutesorganizer/LoginFragment.java
	src/com/example/semanticroutesorganizer/MyGeolocationMap.java