Ben's branch for 1.5.1 includes:
- API
- Security changes for API
- Other bug fixes
Will be merging with jesse's changes and testing
Ben's branch for 1.5.1 includes:
- API
- Security changes for API
- Other bug fixes
Will be merging with jesse's changes and testing
Ben's branch for 1.5.1 includes:
- API
- Security changes for API
- Other bug fixes
Will be merging with jesse's changes and testing
Ben's branch for 1.5.1 includes:
- API
- Security changes for API
- Other bug fixes
Will be merging with jesse's changes and testing
All changes for 1.5.1 by Ben
Merge remote-tracking branch 'origin/grails-upgrade' into grails-upgrade

Conflicts:
	grails-app/conf/BuildConfig.groovy
	target/stacktrace.log
Ben's branch for 1.5.1 includes:
- API
- Security changes for API
- Other bug fixes
Will be merging with jesse's changes and testing
Merge remote-tracking branch 'origin/grails-upgrade' into upgrade_sitemesh_reorg_filesystem

Conflicts:
	grails-app/views/_breadcrumbs.gsp
	grails-app/views/_footerNav-Basic.gsp
	grails-app/views/_footerNav-Edit-Delete.gsp
	grails-app/views/_footerNav-Update-Delete.gsp
	grails-app/views/_footerNav_Create-Save.gsp
	grails-app/views/_themes.gsp
	grails-app/views/application/list.gsp
	grails-app/views/asset/_dialog.gsp
	grails-app/views/contract/list.gsp
	grails-app/views/person/home.gsp
	grails-app/views/person/testPage.gsp
	grails-app/views/uisettings/index.gsp
	target/stacktrace.log
Merge remote-tracking branch 'origin/upgrade_sitemesh_reorg_filesystem' into upgrade_sitemesh_reorg_filesystem