template bundling
Merge remote-tracking branch 'origin/master'

Conflicts:
	static/main/scripts/app/app.js
locale update