Merge branch 'master' of https://github.com/dan91/PlayStartApp

Conflicts:
app/controllers/Application.java
app/models/User.java
app/views/experimenter/edit.scala.html
app/views/experimenter/userSearchResults.scala.html