Content sidebar links correctly to content identifier now
Merge branch 'master' of https://github.com/cshaver88/appinventororg
into cshaver88-master

Conflicts:
	assets/js/coursesystem.js
ya
Milestone commit, lol bad commit message
Cayla's Changes

Added handlers and i frame stuff for the new site