Conflicts:
	lms/djangoapps/django_comment_client/forum/views.py
	lms/djangoapps/django_comment_client/permissions.py
	lms/static/coffee/src/discussion/content.coffee
	lms/static/coffee/src/discussion/utils.coffee
	lms/templates/discussion/_recent_active_posts.html
	lms/templates/discussion/_search_bar.html
	lms/templates/discussion/_thread.html
	lms/templates/discussion/_trending_tags.html
	lms/urls.py

small fix

Conflicts:
	lms/templates/discussion/user_profile.html

started gradebook design; moved a few nav classes

Feature/cale/queue config

Conflicts:
	common/djangoapps/student/models.py
	lms/djangoapps/courseware/views.py
	lms/templates/course_navigation.html

Fix askbot URLs in the theme