merged develop to master head, synced bitbucket and github repo