Finished classroom edit
Edit button commented out
Removed skewer
Deleted unused profile pages
Merge branch 'master' of github.com:se1-1314/xiast
Merge branch 'master' of github.com:se1-1314/xiast
Merge remote-tracking branch 'refs/remotes/origin/youssefbranch'

Conflicts:
	resources/public/js/generic_calendar.js