Adaptive Interface Edits
Merge branch 'master' of https://github.com/jenshen/edx-analytics

Conflicts:
	client/css/main.css