fix all
Merge remote-tracking branch 'origin/master'

Conflicts:
	index.html
	js/index.js
	js/main.js
	login.html
	menu.html
	template.html