add circle ci
Merge develop into master