Add a few TODOs
--working with TDO
Add more todos
Merge branch 'CR-sprint2' into develop

Conflicts:
	app/models/category.rb
CR fixes
bootstrap and CR fixes