Merge branch 'master' of https://github.com/thammasart/hip

Conflicts:
app/controllers/Admin.java
app/models/ExperimentSchedule.java
app/models/mullerLayer/Trial.java
app/views/admin/experiment/main.scala.html
conf/routes
Fixed Merge