reset placeholders

Reset placeholders and listboxes to item 1 on submit.
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/index.html
	public/js/controller.js
Merge remote-tracking branch 'origin/master'