login and layout editing
Merge branch 'master' of https://github.com/dupdup/nesil

Conflicts:
	app/views/main.scala.html
	public/app/pir.js
	public/stylesheets/survey.css