Merge branch 'master' of https://github.com/thekarangoel/TOPS-GiveCamp

Conflicts:
	process.py
Merge branch 'master' of https://github.com/thekarangoel/TOPS-GiveCamp
fixed bug on dashboard. added demo 'upload csv' page
fixed open h1 tag
Merge branch 'boris'
* Fixed angular stuff
* Removed csv/json
* Added upload csv page to angular
adding email html template and logo file
got json to show services offered along with some properties
added quick static file server (node)
basic changes
fixed weird merge conflict issues