text
Merge branch 'master' of https://github.com/Educ8-2014/educ8-angular into text

Conflicts:
	app/modules/room/room.html
textisworking
textisworking
textand animation
Merge branch 'text'