misc stuff for testing environment
Merge branch '1.x' of github.com:cirroweb/cirrodist into 1.x
resolve shit
Merge branch '1.x' of github.com:cirroweb/cirrodist into 1.x
update core and add a few files