Small changes for set up project.
Merge remote-tracking branch 'origin/master'

Conflicts:
	Dojo12/src/dojo12/bootstrap/boostrap_server.go