randomly placed dummyLocations
Merge branch 'master' of https://github.com/pansarshrek/mamn01

Conflicts:
	Phonar/src/se/iDroid/phonar/activities/MainActivity.java
Merge branch 'master' of https://github.com/pansarshrek/mamn01

Conflicts:
	Phonar/src/se/iDroid/phonar/activities/MainActivity.java