Fixing appstyles
Merge branch 'master' of https://github.com/theWizardsBaker/MarkupCalculator

Conflicts:
	AndroidManifest.xml
	res/layout/activity_markup.xml
	res/values-v11/styles.xml
	res/values-v14/styles.xml
	res/values/styles.xml