bugfix
Merge branch 'master' of https://github.com/tnovoselec/iGoOutAndroid

Conflicts:
	IGoOut/src/hr/android/petkovic/igoout/activity/LocationActivity.java