uploading
changed decorator.xml and files
this needs
Merge branch 'master' of https://github.com/isurridge/sip-top

Conflicts:
	skin/src/main/webapp/WEB-INF/jsp/skin/pageTemplate.jsp