Merge branches 'jeffrey-dev' and 'master' of github.com:zhiweihu/pencilme-dev
add mysql-python in production requirements
change the STATIC_ROOT to "static"
change the STATIC_ROOT to "assets"
add the ROOT_PATH in wsgi.py
change the wsgi.py path
Update README.rst
add: twilio test script with login info
add twilio to requirements base
[pendings] un-hardcode user for pendings page
Merge branches 'jeffrey-dev' and 'master' of github.com:xHFT/pencilme-dev into jeffrey-dev
add linkedin and google login