added template and enabled content api routing
fixed translation bug
fixed translation bug
Merge branch 'feature/templates' into develop

Conflicts:
	composer.lock