more filtering
some migration motion
Merge branch 'master' of https://github.com/posttool/currently13

Conflicts:
	app/hackettmill/models.js
	app/public/css/main.css
	app/public/js/browse.js
migration stuff