Fix to template version
fix conflict

Conflicts:
	js/setting.js