Updated for kuali deployment.
Merge branch 'dev' into release
Merge branch 'test' into release
Merge
Merge branch 'dev'
Merge branch 'dev'

Conflicts:
	server/gokb/grails-app/conf/Config.groovy
HTTPS connection now used for Kuali instances.
Merge branch 'dev' into release
Changed elasticsearch dependency