add missing file
Merge branch 'branch-1.0' of https://github.com/galaxyeye/satellite into
branch-1.0

Conflicts:
	conf/config.json