index.jsp
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	src/com/chrzha/map/MainActivity.java