test
Merge branch 'master' of https://github.com/Jijokoickal/AndroidApps

Conflicts:
	Test/AndroidManifest.xml
	Test/res/values-sw600dp/dimens.xml
	Test/res/values-sw720dp-land/dimens.xml
	Test/res/values-v11/styles.xml
	Test/res/values-v14/styles.xml
	Test/res/values/strings.xml
	Test/res/values/styles.xml