Fixed loading hibernate settings from properties
Added another set of JavaDoc comments
I hope this fixes the NPE - this is quite weird...
Hope this works...
Added fields to PatientDetailView and corrected image URL for Person
Added some logging, to find out why hibernate doesn't work on the CI
server...
Search Implementation.
Merge branch 'master' into Sprint2/SearchControl

Conflicts:
	Project Pink/src/main/java/ch/bfh/bti7081/s2013/pink/PatientSearchView.java
	Project Pink/src/main/java/ch/bfh/bti7081/s2013/pink/SessionOverView.java
	Project Pink/src/main/java/ch/bfh/bti7081/s2013/pink/model/HibernateDataSource.java
Merge branch 'implementation-guidelines'
Updated diary
Merge branch 'master' of https://github.com/simonkrenger/ch.bfh.bti7081.s2013.pink.git
Will this work?
Merge branch 'master' of https://github.com/simonkrenger/ch.bfh.bti7081.s2013.pink
It's getting boring, but I can't reproduce the problem locally...
Well, I think this should finally work...
Added a bit more JavaDoc, fixed JavaDoc warnings
Fix for Build.
Merge remote-tracking branch 'origin/task11-2.7' into Sprint2/MobileGUI
Merge remote-tracking branch 'origin/implementation-guidelines' into Sprint2/MobileGUI
Merge remote-tracking branch 'origin/Sprint2/SearchControl' into Sprint2/MobileGUI