no message
fixed bug: password was not saved as hash when editing profile

Note: design of advert lists not responsive
no message
Added JUnit Test for Spring. Modified pom.xml, web.xml, springMVC.xml
Added Tests for UserDao, UserRoleDao, NotifiesDao
Picture Test, funnily needs even no real picture to run...
Edit Add with Http 500 error without solution
The IntegrationTest for SearchDao
The EnquiryDao Junit test
Finally Bookmark JUnit tests
To do tests, always uncomment Line 36 in springMVC.xml !!
Message when user is not known or password is incorrect @ login.
Fixed multiple bugs. See email (@10.11.14: 11:06) for further info.
Merge branch 'master' of https://github.com/ese-unibe-ch/ese2014-team5 into changeshowAd

Conflicts:
	Skeleton/src/main/java/org/sample/controller/IndexController.java
	Skeleton/src/main/java/org/sample/controller/service/SampleService.java
	Skeleton/src/main/java/org/sample/controller/service/SampleServiceImpl.java
	Skeleton/src/main/webapp/pages/showad.jsp
	Skeleton/src/main/webapp/web/css/style.css
Added Javadoc for SampleService
Merge branch 'changeshowAd' of https://github.com/ese-unibe-ch/ese2014-team5

Conflicts:
	Skeleton/src/main/java/org/sample/controller/service/SampleService.java
	Skeleton/src/main/java/org/sample/controller/service/SampleServiceImpl.java
little bug fix made by merge
Added notification when bookmarked ad changes
Added Notification highlight when you have unread messages
Bugfixing
Notifications for selected search in profile are generated when new ad is created
Merge commit '028f014c8e1d7976a42c50b6bdf902a58b0a3419' into search-notification

Conflicts:
	Skeleton/src/main/java/org/sample/controller/IndexController.java
	Skeleton/src/main/java/org/sample/controller/service/SampleService.java
	Skeleton/src/main/java/org/sample/model/dao/UserDao.java