?
Merge branch 'categories' of github.com:AlexZerr/bonediva into categories

Conflicts:
	db/schema.rb