Massive ugrade to project, unstable build
Merge branch 'Default' into iMac-changes

Conflicts:
	grails-app/conf/BootStrap.groovy
	grails-app/conf/BuildConfig.groovy
	target/classes/gsp/views.properties

target/classes/gsp_springSecurityUi_layoutsspringSecurityUI_gsp_linenumb
ers.data
	target/classes/gsp_springSecurityUi_securityInfoconfig_gsp_html.data

target/classes/gsp_springSecurityUi_securityInfoconfig_gsp_linenumbers.d
ata

target/classes/gsp_springSecurityUi_securityInfocurrentAuth_gsp_html.dat
a

target/classes/gsp_springSecurityUi_securityInfocurrentAuth_gsp_linenumb
ers.data

target/classes/gsp_springSecurityUi_securityInfofilterChain_gsp_html.dat
a

target/classes/gsp_springSecurityUi_securityInfofilterChain_gsp_linenumb
ers.data

target/classes/gsp_springSecurityUi_securityInfologoutHandlers_gsp_html.
data

target/classes/gsp_springSecurityUi_securityInfologoutHandlers_gsp_linen
umbers.data
	target/classes/gsp_springSecurityUi_securityInfomappings_gsp_html.data

target/classes/gsp_springSecurityUi_securityInfomappings_gsp_linenumbers
.data
	target/classes/gsp_springSecurityUi_securityInfoproviders_gsp_html.data

target/classes/gsp_springSecurityUi_securityInfoproviders_gsp_linenumber
s.data
	target/classes/gsp_springSecurityUi_securityInfousercache_gsp_html.data

target/classes/gsp_springSecurityUi_securityInfousercache_gsp_linenumber
s.data
	target/classes/gsp_springSecurityUi_securityInfovoters_gsp_html.data

target/classes/gsp_springSecurityUi_securityInfovoters_gsp_linenumbers.d
ata
	target/stacktrace.log
	target/work/gspcompile/gsp_databaseMigration_dbdoc_globalnav_gsp.groovy
	target/work/gspcompile/gsp_databaseMigration_dbdoc_index_gsp.groovy

target/work/gspcompile/gsp_databaseMigration_dbdoc_overview_summary_gsp.
groovy

target/work/gspcompile/gsp_databaseMigration_dbdoc_stylesheet_gsp.groovy
	target/work/gspcompile/gsp_mail__testemailsi18ntest_gsp.groovy
	target/work/gspcompile/gsp_mail__testemailstagtest_gsp.groovy
	target/work/gspcompile/gsp_mail__testemailstest_gsp.groovy
	target/work/gspcompile/gsp_mail__testemailstesthtml_gsp.groovy
	target/work/gspcompile/gsp_springSecurityUi_aclClasscreate_gsp.groovy
	target/work/gspcompile/gsp_springSecurityUi_aclClassedit_gsp.groovy
	target/work/gspcompile/gsp_springSecurityUi_aclClasssearch_gsp.groovy
	target/work/gspcompile/gsp_springSecurityUi_aclEntrycreate_gsp.groovy
	target/work/gspcompile/gsp_springSecurityUi_aclEntryedit_gsp.groovy
	target/work/gspcompile/gsp_springSecurityUi_aclEntrysearch_gsp.groovy

target/work/gspcompile/gsp_springSecurityUi_aclObjectIdentitycreate_gsp.
groovy

target/work/gspcompile/gsp_springSecurityUi_aclObjectIdentityedit_gsp.gr
oovy

target/work/gspcompile/gsp_springSecurityUi_aclObjectIdentitysearch_gsp.
groovy
	target/work/gspcompile/gsp_springSecurityUi_aclSidcreate_gsp.groovy
	target/work/gspcompile/gsp_springSecurityUi_aclSidedit_gsp.groovy
	target/work/gspcompile/gsp_springSecurityUi_aclSidsearch_gsp.groovy

target/work/gspcompile/gsp_springSecurityUi_includes_ajaxLogin_gsp.groov
y
	target/work/gspcompile/gsp_springSecurityUi_layoutsregister_gsp.groovy

target/work/gspcompile/gsp_springSecurityUi_layoutsspringSecurityUI_gsp.
groovy
	target/work/gspcompile/gsp_springSecurityUi_loginauth_gsp.groovy
	target/work/gspcompile/gsp_springSecurityUi_openIdLoginauth_gsp.groovy

target/work/gspcompile/gsp_springSecurityUi_persistentLoginedit_gsp.groo
vy

target/work/gspcompile/gsp_springSecurityUi_persistentLoginsearch_gsp.gr
oovy

target/work/gspcompile/gsp_springSecurityUi_registerforgotPassword_gsp.g
roovy
	target/work/gspcompile/gsp_springSecurityUi_registerindex_gsp.groovy

target/work/gspcompile/gsp_springSecurityUi_registerresetPassword_gsp.gr
oovy

target/work/gspcompile/gsp_springSecurityUi_registrationCodeedit_gsp.gro
ovy

target/work/gspcompile/gsp_springSecurityUi_registrationCodesearch_gsp.g
roovy
	target/work/gspcompile/gsp_springSecurityUi_requestmapcreate_gsp.groovy
	target/work/gspcompile/gsp_springSecurityUi_requestmapedit_gsp.groovy
	target/work/gspcompile/gsp_springSecurityUi_requestmapsearch_gsp.groovy
	target/work/gspcompile/gsp_springSecurityUi_rolecreate_gsp.groovy
	target/work/gspcompile/gsp_springSecurityUi_roleedit_gsp.groovy
	target/work/gspcompile/gsp_springSecurityUi_rolesearch_gsp.groovy

target/work/gspcompile/gsp_springSecurityUi_securityInfoconfig_gsp.groov
y

target/work/gspcompile/gsp_springSecurityUi_securityInfocurrentAuth_gsp.
groovy

target/work/gspcompile/gsp_springSecurityUi_securityInfofilterChain_gsp.
groovy

target/work/gspcompile/gsp_springSecurityUi_securityInfologoutHandlers_g
sp.groovy

target/work/gspcompile/gsp_springSecurityUi_securityInfomappings_gsp.gro
ovy

target/work/gspcompile/gsp_springSecurityUi_securityInfoproviders_gsp.gr
oovy

target/work/gspcompile/gsp_springSecurityUi_securityInfousercache_gsp.gr
oovy

target/work/gspcompile/gsp_springSecurityUi_securityInfovoters_gsp.groov
y
	target/work/gspcompile/gsp_springSecurityUi_usercreate_gsp.groovy
	target/work/gspcompile/gsp_springSecurityUi_useredit_gsp.groovy
	target/work/gspcompile/gsp_springSecurityUi_usersearch_gsp.groovy