half merge with stashed files
admin endless scroll
merged in brennan's conflicts
Merge branch 'master' of https://github.com/calblueprint/projectPortal