Tweaked loading behavior
Merge branch 'develop' of github.com:maddchickenz/whereatdrexel-webapp into develop