Conflicts:
	lms/templates/index.html

Moved lms/static/images/portal-icons/ to lms/static/portal-icons/, because collecstatic wants it there. We should figure out why, but it was blocking the build.

Store rss instead of parser in memcache.

Added a migration with indexes on course enrollment and a unique constraint. This involves a migration that first drops the table, because there may be non-unique data there already.

Login errors should display on first failure.

Course start

Conflicts:
	common/djangoapps/student/views.py

Template caching

edX caching

Dormsbee/portal display tweaks

Changed check_course from a decorator to a regular function that throws exceptions. Much easier to understand now.

Use Course.number, remove final exam and content length from the course sidebar (do we have that data yet?)

Conflicts:
	common/lib/xmodule/xmodule/course_module.py
	lms/urls.py

Dormsbee/portal display tweaks

Conflicts:
	lms/static/sass/application.css

renames some scss files for better orginization, sets fixed widths on main containers to avoid akward scaling issues untill media queries can be added for more responsive scaling