Merge branch 'master'
#32 Customer CSDUR OK
Merge branch 'Route'
Merge branch 'origin/master'
#32 Customer OK
Conflicts:
	extjs-app/metadata/Application
	grails-app/conf/BootStrap.groovy