Updating UserControllerSpec and removing old UserController and RoleController
Refactoring more functional tests
Updating GebConfig for more timeout in running functional tests
Refactoring functional tests
Merge changes from develop origin into this branch
Adding xlxs template file
Removing RelationshipImporter controller and service
Updating bootstrap, adding plugin reference
Updating buildconfig to use MC-Plugin latest version
Merge branch 'feature/MC-329_single_site' of https://github.com/ModelCatalogue/modelcatalogue into feature/MC-329_single_site

Conflicts:
	grails-app/conf/BuildConfig.groovy