More survey bugs fixed. Survey lock. More UI improvements
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	public/js/studies.js
	public/partial/studies.html
	routes/survey.rb