Changed server to research.dfarooq.com
Merge branch 'buildon' into deploy