fixes a few issues caused by the merge.
Merge branch 'master' of https://github.com/PX9e/linkingsciences

Conflicts:
	linkingscience/app/controllers/Application.java
	linkingscience/app/views/project.scala.html