Annotations in service beans changed to @Service
Merge remote-tracking branch 'origin/Develop' into Develop
Merge remote-tracking branch 'origin/Develop' into Develop
Refactoring services
added checking code for unique
new pagination macros
Merge remote-tracking branch 'origin/Develop' into Develop
Merge remote-tracking branch 'origin/Develop' into Develop
Merge remote-tracking branch 'origin/Develop' into Develop
Moving search filters to common SearchPage