manifest support
Merge branch 'master' of https://github.com/dioklecijan/FirstProject

Conflicts:
	configs/ag/config.json
	configs/mars/config.json
	configs/xxDevelop/config.json
	server/server.js