Working toward adding passworded users
Merge branch 'master' of github.com:mikesname/docview

Conflicts:
	app/controllers/Admin.scala