Revert "Revert "Lots of small fixes, some merged from dropbox integration branch""

This reverts commit 83ac422f003a401bf35d7f32940bda1f4107bd15.

Conflicts:
	core/utils.py
	core/views.py
	static/js/app.js