Added travis config
Ups, app_name _imported_ in translation
Fix controller template
Merge ../x0y0

Conflicts:
	.travis.yml