Templates panel UI modifications
Color change
Little fix
Merge branch 'master' into mircea

Conflicts:
	js/base.js
Merge branch 'mircea'