Testing commit from intelliJ IDE VCS
Updating the grails version to 2.3.2
Merge branch 'master' of ssh://github.com/aeothomas/bumblebee

Conflicts:
	rest/commerce/application.properties
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of ssh://github.com/aeothomas/bumblebee

Conflicts:
	rest/commerce/application.properties
removing back up file
added the base controllers and views for the main resources.
adding new .gitignore file in project.
committed to the version of dependencies. updated configuration and added new controller for error mappings
Updating some base files before pulling master branch
Merge branch 'master' into feature-base-structure

* master:
  remove the incorrect package
  Solving the source folder structure
  Backup
  Update
Update error response handling
backup
finally got base rest wiring working
adding modified files
updated controllers and removed Test files
updating grails version before attempting to create grails wrapper
updated url mappings, controllers and add grails wrapper to ease development experimentation
URL mappings finalised - time to rock n roll!
reset the config to debug level