Sub Categories
sub categories working
first commit
Merge remote-tracking branch 'upstream/master'

Conflicts:
	config/database.yml
Merge remote-tracking branch 'upstream/menu_json'
Add sub_categories from new and edit equipment