Pixel-UI integration

Pixel-UI integration
UI Integration
new model class
dump data file
Merge branch 'master' of https://github.com/geeknotnerd/techresource

Conflicts:

content-aggregator/src/main/java/com/techresources/ca/model/Resource.jav
a
	web/app/services/IAdminService.java