0.5.0-4

Conflicts:
	package.json
dont display all categories
Merge remote-tracking branch 'origin/master' into 0.5.1