Revert "Revert "Merge pull request #960 from dimagi/fd-types-cleanup""

This reverts commit b7db27efb3d1307ad7754ba66876cc724f5b8662.
move unicef reports to custom/reports folder
use correct table name
move to custom/apps folder
add hotfix_deploy to fab
area => sector
cleanup cvsu reports
Merge branch 'master' into unicef_cvsu_reports

Conflicts:
	settings.py
remove old files
add fluff database back into settings
change area to sector in global report as well
only show reports to 'previewers'
disabled upload button when upload starts
remove old maps report and start scaffolding new one
import leaflet
loading test data and geojson
display geojson
bind detail popup
fix references to deprecated classes
misc buildout