Testing 3
blah
Merge branch 'MW-7.6.2013-rev.1' into 07.06.2013

Conflicts:
	js/studentPortal.js
Js Upload
Merge branch '07.06.2013'