Merge pull request #84 from dr40/dev

Merge pull request #83 from dr40/ok/74/Manage_Category
Merge pull request #92 from dr40/cv/81/Main_Page_Bootstrap

Cv/81/main page bootstrap
Merge pull request #97 from dr40/cv/81/Main_Page_Bootstrap

#81 Posts added to Home page
#82 - Manage Post
IVVQ-Group5-Musements-74 Manage Category
IVVQ-Group5-Musements-74 Manage Category
Merge pull request #100 from dr40/ok/74/Manage_Category

Ok/74/manage category
IVVQ-Group5-Musements-74 Manage Category
Merge pull request #102 from dr40/ok/74/Manage_Category

IVVQ-Group5-Musements-74 Manage Category
#82 - Manage Post
Merge remote-tracking branch 'origin/dr/82/Manage_Post' into cv/81/Main_Page_Bootstrap

Conflicts:
	Musement/grails-app/controllers/musement/PostController.groovy
	Musement/grails-app/services/musement/PostService.groovy
Merge remote-tracking branch 'origin/ha/69/Manage_Notification' into cv/81/Main_Page_Bootstrap

Conflicts:
	Musement/grails-app/controllers/musement/PostController.groovy
#82 - Manage Post
#82 - Manage Post
Merge remote-tracking branch 'origin/dr/82/Manage_Post' into dr/82/Manage_Post
Merge remote-tracking branch 'origin/cv/81/Main_Page_Bootstrap' into dr/82/Manage_Post

Conflicts:
	Musement/grails-app/controllers/musement/PostController.groovy
	Musement/grails-app/services/musement/PostService.groovy
Merge remote-tracking branch 'origin/ha/69/Manage_Notification' into dr/82/Manage_Post

Conflicts:
	Musement/grails-app/controllers/musement/PostController.groovy
Merge remote-tracking branch 'origin/dr/82/Manage_Post' into ha/69/Manage_Notification
#81 Home, Auth views updated
Merge remote-tracking branch 'origin/cv/81/Main_Page_Bootstrap' into dr/82/Manage_Post

Conflicts:
	Musement/grails-app/controllers/musement/PostController.groovy
	Musement/grails-app/services/musement/PostService.groovy