merge
Merge branch 'master' of https://github.com/Digt/TrustedNet

Conflicts:
	Server/Portal/trustednet-portal/src/main/webapp/WEB-INF/jsp/views/page.jsp
	Server/Portal/trustednet-portal/src/main/webapp/static/css/rave.css
merge
merge
Merge branch 'master' of https://github.com/Digt/TrustedNet