Some Changes to Login form
Merge branch 'master' of git@github.com:ese-unibe-ch/ese2014-team2.git
Not Broken jet
Merge branch 'master' of git@github.com:ese-unibe-ch/ese2014-team2.git

Conflicts:
	Skeleton/src/main/java/org/eseTeam2/controller/AdController.java
Added new version of SRS.pdf

Die scheisse geht





Biatsch!!!!!!!!!!!!!!!!!!!!!!!!!!