Started adding modals.
Merge remote-tracking branch 'origin/master'

Conflicts:
	Website/Scripts/typings/cs/csComp.d.ts
	Website/public/app/app.js.map
	Website/public/js/cs/csComp.js
	Website/public/js/cs/csComp.min.js