Merge branch 'master' into m1
Merge branch 'master' into m2
Added link to gr8crm.github.io
Merge branch 'master' into m1
Merge branch 'master' into m2
Cleanup
Merge branch 'm1' into m2
Enabled multiple file upload
Ready for crm-content-ui release 2.0.0
Merge branch 'm2' into m3

Conflicts:
	grails-app/conf/BuildConfig.groovy
Ready for crm-content-ui release 2.0.0
Merge branch 'm2' into m3

Conflicts:
	grails-app/conf/BuildConfig.groovy