Merge branch 'main' into issue406
Merge branch 'main' into issue406
Merge branch 'main' into issue406
Added editing availability to admin check availability module.
Not have to scroll to the bottom of the page each time you edit a resource/classroom.
Put forms on research page at the top of the list instead of bottom.
Switch to new format for settings.CACHES

This should prevent warnings from being displayed whenever the code is
imported.
(cherry picked from commit 5829d326fca496914c73c093f765482d3578acd6)
Merge pull request #617 from learning-unlimited/stop_shell_warning

Stop settings.CACHES warnings from bring printed at startup
Some commpanel fixes
Merge branch 'issue406' of github.com:uakfdotb/ESP-Website into issue406tmp

Conflicts:
	esp/templates/program/modules/availabilitymodule/check_availability.html
Tweak indenting on availabilitymodule.py
Merge pull request #584 from uakfdotb/resourcetop2

Don't have to scroll down resource page
Merge pull request #621 from learning-unlimited/commpanel_fix

Some commpanel fixes
Updated django-reversion version in dev setup script

Current/default version of django-reversion is 1.7 which isn't compatible
with django 1.4.  This change specifies django-reversion version 1.6.
Merge pull request #622 from ruthie/main

Updated django-reversion version in dev setup script
Merge pull request #625 from learning-unlimited/stable-mar13

Merge stable release 3 into main
Fixes bug in scheduling checks module

Module previously assumed that all grades would be in the range 7-12.
Now calls the correct module extension function to get the grade range
of the program.
Merge branch 'stable-mar13' into main