left sliding panel finalised without css
final left login panel without css
both sliding panels integerated without css
20april 5.37 pm
both panels integerated 1am 21st
Merge branch 'studentuser' of https://github.com/Radsaggi/BetLiMS into sliding-navbar

Conflicts:
	app/views/main.scala.html
Added support for logging in, in the html templates
Merge branch 'issue-return' of https://github.com/Radsaggi/BetLiMS into sliding-navbar

Conflicts:
	app/views/search.scala.html
Merge branch 'issue-return' of https://github.com/Radsaggi/BetLiMS into sliding-navbar
added files missed by chance in both login panels
Added Blowfish for password Hashing
Added the Secred trait for authentication
Merge branch 'sliding-navbar' of https://github.com/shankdude/BetLiMS into sliding-navbar for testing PR #36

Conflicts:
	app/views/main.scala.html
	app/views/search.scala.html
	public/stylesheets/main.css
Resolved merge conflicts
Merge branch 'studentuser'

Conflicts:
	app/controllers/Application.scala
	test/ApplicationSpec.scala