adding add category button in forum-view
Merge branch 'develop' of github.com:42Zavattas/intra into develop

Conflicts:
	app/views/partials/forum.html
trying to push a new subcategory - doesnt work
adding subcategories
Merge branch 'develop' of github.com:42Zavattas/intra into develop

Conflicts:
	app/scripts/controllers/forum.js
	app/scripts/services/forum.js