Initial
Merge branch 'origin/master'

Conflicts:
	.classpath
	.project
	AndroidManifest.xml
	bin/AndroidManifest.xml
	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/values/dimens.xml
	res/values/strings.xml
	res/values/styles.xml