Synced requirements.txt and setup.py
Merge branch 'master' into dashboard