Initial commit
rebuilding, still not ready for server now
update
rebuilding
Merge branch 'master' of github.com:Statemood/metis-2.1

Conflicts:
	README.md
	cfg/db
	cfg/metis.cfg.ge
update