Initial commit
initial checkin...
Merge branch 'refs/heads/develop'

Conflicts:
	.idea/misc.xml
	app/src/main/AndroidManifest.xml
	app/src/main/res/values/styles.xml
Merge branch 'refs/heads/master' into develop