Moved things around a little.
pre-merge
Merge remote-tracking branch 'origin/13/01/14-Luke'

Conflicts:
	Server_Files/IA/portal.php

	modified:   Server_Files/IA/portal.php
	renamed:    Server_Files/IA/InlineAssessment.lib.js -> Server_Files/InlineAssessment.lib.js