CRAFTERCMS-395 - Pagination
Integrating UI Plugin with create
Merge branch 'master' of https://github.com/craftercms/social

Conflicts:
	server/src/main/java/org/craftercms/social/controllers/rest/v1/UGCRestController.java
	server/src/main/java/org/craftercms/social/services/UGCService.java
	server/src/main/java/org/craftercms/social/services/impl/UGCServiceImpl.java
	server/src/main/resources/scheduler-context.xml
Merge branch 'master' of https://github.com/craftercms/social
Merge pull request #41 from sandramo/master

Beginning of UI plugin integration
update error handler when status is updated
changing resources folder to static-assets and add cdadmin folder
Initial upload containing refactors and webapp structure.
Merge remote-tracking branch 'alvaro/master'
Merge remote-tracking branch 'roy/master'
Merge branch 'master' of github.com:craftercms/social
CRAFTERCMS-437: Integrating with UI plugin