greška
Merge branch 'master' of https://github.com/Reeebuuk/RennRenn.git

Conflicts:
	SearchLocationActivity/src/mi/smo/jaki/renn/SearchLocationActivity.java

	fix