improved comments
merge conflicts2
Merge remote-tracking branch 'origin/13/01/25-Luke-(Portal-changes)' into 1/22/13-david