in progress...
Merge branch 'master' into search-notification

Conflicts:
	Skeleton/src/main/java/org/sample/controller/service/SampleService.java
	Skeleton/src/main/java/org/sample/controller/service/SampleServiceImpl.java
commit to save uncompleted work
Notifies are saved in database if price and size values match with search filter in profile, this happens when a new advert is created
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