text views and edit texts
Merge branch 'master' of https://github.com/team-LRP/shinedotcom

Conflicts:
	.idea/gradle.xml
	shinedotcom.iml
	shinedotcom/shinedotcom-shinedotcom.iml
Merge branch 'master' of https://github.com/team-LRP/shinedotcom

Conflicts:
	.idea/gradle.xml
	shinedotcom.iml
	shinedotcom/shinedotcom-shinedotcom.iml