finished login functionality, added logout/login link in navigation
added comment to login function because it's insecure (cookie, play framework)
Merge branch 'master' of https://github.com/ckristo/WAE-CM-SS2014-G1

Conflicts:
	csdr-g1/app/controllers/Application.java
	csdr-g1/app/views/navigation.scala.html
	csdr-g1/conf/routes