Update Project relationship with services and categories from belongsTo to hasAndBelongstoMany UI Fixes
Merge branch 'master' of https://github.com/vicocamacho/tacoarquitecturacontextual

Conflicts:
	app/controllers/categories_controller.rb
	app/models/adminpanel/category.rb
	app/views/categories/index.html.erb
	app/views/posts/show.html.erb
	app/views/services/index.html.erb
	config/routes.rb
	db/schema.rb
Bunch of Public Site Implementation