functionable
init text delete
update
change build target sdk version
name fix
Updated build environment
Add google support libraries
Merge branch 'developU' into develop

Conflicts:
	app/app.iml
	app/build.gradle
	app/src/main/res/values-v21/styles.xml