revision comparison tip
Merge remote-tracking branch 'origin/master'

Conflicts:
	static/js/model.coffee
add compiled css files back to reduce configuration and set up work