La till kommentar rad 26
Merge branch 'master' of https://github.com/Grynet/Temp

Conflicts:
	MyGelocation/src/com/pvt/mygelocation/MainActivity.java
	appcompat_v7/bin/android-support-v7-appcompat.jar