Update project url in setup.py
Merge branch 'master' into dev