For each dude!
Merge branch 'master' into timeline

Conflicts:
	static/assets/js/codebrowser-min.js
Merge branch 'timeline' of github.com:codebrowser/web-client into timeline

Conflicts:
	static/assets/js/codebrowser-min.js