UI addons
Merge branch 'master' of github.com:thebitisland/locartor

Conflicts:
	res/layout/activity_main.xml
	res/layout/secondview.xml
	src/com/thebitisland/locartor/SaveLocationActivity.java