added extra persist() to save changes made in Application.postPersist(), added isMashup() check
Merge pull request #111 from flamingo-geocms/bug/104-copied-component-configs-not-saved

added extra persist() to save changes made in Application.postPersist(), fixes #104
actionBean for getting component resources that are not available with http. Typical usable for 3d party components
added url to ComponentResourceActionBean in the app.jsp

Conflicts:

	viewer/src/main/webapp/WEB-INF/jsp/app.jsp
show custom button icon in correct size
Merge pull request #115 from flamingo-geocms/feat/load-component-resources

Feat/load component resources
Merge branch 'master' into feat/solrsearch

Conflicts:
	viewer/src/main/webapp/WEB-INF/jsp/app.jsp