Merge branch 'master' of github.com:infinitydao/dao

Conflicts:
	gelib/0.2/include/emptyitem.h