Controllers and Views Tests
Remove changes for Controller and Views
Merge branch 'master' of https://github.com/gpothier/funfork

Conflicts:
	FunFork/.settings/org.eclipse.core.resources.prefs
	FunFork/grails-app/controllers/funfork/products/CategoryController.groovy
	FunFork/grails-app/views/category/list.gsp
	FunFork/grails-app/views/category/show.gsp