Changes
Merge pull request #5 from rayguard/development

Changes
Update E Filing | Campus Events Index Page
Merge branch 'master' of https://github.com/maxcobmara/ogma into development

Pull Merge
manual reset
Merge branch 'master' into development

Manual Merge
Update E Filing | Campus Events Index Page
Update E Filing | Campus Events Index Page
manual merge
Merge pull request #9 from raqibhakim/master

Update E Filing | Campus Events Index Page
merges and fixes
Merge branch 'development' of https://github.com/maxcobmara/ogma into development

Manual Pull Merge
add assetviews in location
merge master
migration for location combo code
updates for student residence
fixes and updates from prod