back porting of loading indicator fixes from development branch
version bump
make rules sortable (no save yet)
ordering for rules finished
fixed for another race condition with loading data
cleanup for the fix
version bump
Merge branch 'master' into development

Conflicts:
	app/css/style.css
	app/helper.coffee