Category Management working
Merge remote-tracking branch 'origin/master'

Conflicts:
	parse/public/index.html
Basic UI working