Refurbished the develop branch. Latest changes as per current WIP.

I have tested, and this pull request should seamlessly merge with https://github.com/hasgeek/peopleflow/tree/develop