use GLM for time estimates
only use core resources for time estimates
displaying time estimates to admin user
admin user can update learning times
use newer version of NumPy
Merge branch 'master' into time_estimates
only display finished concepts in browsing view
responsive landing page
removed cserved_communicator
removed unnecessary makefile command
refactoring deprecated content server
CG instead of BFGS for time estimates
fixed edition_years bug
doc type field for roadmaps
separate roadmaps and course guides in browsing view
Merge branch 'master' of https://github.com/metacademy/metacademy-application

Conflicts:
	server/static/lib/kmap
migrated time estimate and roadmap updates to new server dir
updated gitmodule locatiosn
updated Makefile with new server directory
fixed browsing view title