Updating Templates Layout
Merge remote-tracking branch 'origin/master'

Conflicts:
	templates/default/html/views/index.html
	templates/default/js/template.js