Updated bowery. Fixed styles.
Merge branch 'master' into nested-sort

Conflicts:
	assets/js/directives.js