merge doc template
Merge branch 'master' of https://github.com/DZTGroup/chariot

Conflicts:
	app/controllers/Application.java
docx service