coomit prepare merge fix bug
Merge branch 'local'

Conflicts:
	templates/index.html