add circle-ci
to circle-ci
Merge remote-tracking branch 'origin/circle-ci' into develop