Fix for Build.
Merge branch 'master' into Sprint2/SearchControl
Merge remote-tracking branch 'origin/implementation-guidelines' into Sprint2/SearchControl
Merge remote-tracking branch 'origin/task11-2.7' into Sprint2/SearchControl
Change Layout & Update web.xml
Merge remote-tracking branch 'origin/Sprint2/SearchControl'
Merge remote-tracking branch 'origin/master' into Sprint2/MobileGUI

Conflicts:
	Project Pink/src/main/java/ch/bfh/bti7081/s2013/pink/PatientSearchView.java
	Project Pink/src/main/java/ch/bfh/bti7081/s2013/pink/SessionList.java
	Project Pink/src/main/java/ch/bfh/bti7081/s2013/pink/view/SessionOverView.java