update the develop branch (no more direct pulling into master)