Added various
Merge origin/master

Conflicts:
	NAM.WebApp/public_html/js/NAM_app/views/myprofile.html