Sömn 2.0
Merge branch 'master' of https://github.com/Grynet/Temp

Conflicts:
	MyGelocation/src/com/pvt/mygelocation/MainActivity.java