Refactored some stuff
Merge branch 'master' of https://github.com/ukupat/linkrepo

Conflicts:
	app/controllers/Shelf.java
	app/views/shelf.scala.html