Merge remote-tracking branch 'mikael/master'

Conflicts:
	ReloadServer/application/reload_manager.js