Modified in server
Merge branch 'master' of https://github.com/torresmateo/moderate-categories

Conflicts:
	views/template/js/moderate-categories.js