teachers ui
Merge branch 'develop' of https://github.com/Tashie/E-Journal into develop

Conflicts:
	journal-webapp/src/main/resources/messages/messages_en.properties