Merge branch 'origin/master'

Conflicts:
	application.properties
	grails-app/conf/BuildConfig.groovy
	grails-app/conf/Config.groovy
	grails-app/conf/DataSource.groovy
	grails-app/conf/UrlMappings.groovy
	grails-app/i18n/messages_da.properties
	grails-app/i18n/messages_es.properties
	grails-app/i18n/messages_it.properties
	grails-app/i18n/messages_ja.properties
	grails-app/i18n/messages_pt_BR.properties
	grails-app/i18n/messages_th.properties
	grails-app/taglib/com/sysgears/examples/DynamicElementsTagLib.groovy
	grails-app/views/error.gsp
	grails-app/views/index.gsp
	grails-app/views/layouts/main.gsp
	grails-app/views/partials/dynamicElements/_add.gsp
	web-app/WEB-INF/applicationContext.xml
	web-app/WEB-INF/sitemesh.xml
	web-app/WEB-INF/tld/c.tld
	web-app/WEB-INF/tld/fmt.tld
	web-app/css/main.css
	web-app/js/application.js
	web-app/js/dynamicElements.js
Merge branch 'master' of github.com:Flash-/dynamic-elements-taglib