UPDATE!!!

:D
Merge branch 'master' of https://github.com/troverman/inlrn

Conflicts:
	applications/inlrn/controllers/default.py
	applications/inlrn/views/default/academies.html
	applications/inlrn/views/default/courses.html
	applications/inlrn/views/default/member.html