Added texts
Merge branch 'feature/Add_text' into develop

Conflicts:
	src/main/webapp/index.html