hey jude
Merge branch 'master' of https://github.com/jmarti/buala

Conflicts:
	assets/js/filterctrl.js