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

Conflicts:
	Server/Portal/trustednet-login/src/main/webapp/WEB-INF/applicationContext.xml
	Server/Portal/trustednet-portal/src/main/webapp/WEB-INF/jsp/layouts/profile_layout.jsp
	Server/Portal/trustednet-portal/src/main/webapp/static/js/profile.js
merge
add edit-cancel-send buttons control
Merge branch 'master' of https://github.com/Digt/TrustedNet

Conflicts:
	Server/Portal/trustednet-portal/src/main/webapp/static/js/profile.js