Merge pull request #1 from m-bodmer/pt-to-jq

Pt to jq
Corrected rubrics CSS file
Merge pull request #1008 from Keraunos/CSSCorrections

Corrected rubrics CSS file
Make Login Page use jQuery UI Modal and add jQuery UI CSS and CSS assets
Merge branch 'master' of git://github.com/MarkUsProject/Markus into pt-to-jq
Merge branch 'pt-to-jq' of github.com:m-bodmer/Markus into pt-to-jq
Merge branch 'pt-to-jq' of github.com:m-bodmer/Markus into pt-to-jq
Clean up the javascript includes in the application content layout