New server URL to donwload from GitHub
Merge branch 'dev'

Conflicts:
	server/gokb/grails-app/conf/Config.groovy