New Branch
Added new files to alternative branch
Delete test~
Renamed project.
Merge branch 'master' of https://github.com/andfoy/candelaria-maps

Conflicts:
	AndroidManifest.xml
	bin/AndroidManifest.xml
	bin/classes.dex
	bin/res/crunch/drawable-hdpi/ic_launcher.png
	bin/res/crunch/drawable-mdpi/ic_launcher.png
	bin/res/crunch/drawable-xhdpi/ic_launcher.png
	bin/res/crunch/drawable-xxhdpi/ic_launcher.png
	bin/resources.ap_
	project.properties
	res/drawable-hdpi/ic_launcher.png
	res/drawable-mdpi/ic_launcher.png
	res/drawable-xhdpi/ic_launcher.png
	res/drawable-xxhdpi/ic_launcher.png
	res/layout/activity_main.xml
	res/menu/main.xml
	res/values/strings.xml

Merge alternative with master