catch common errors in location bulk import
add receipts to sales/consumption report
psi report changes
show hierarchy on cumulative sales/consumption report
remove dead code
Merge branch 'master' into commtrack

Conflicts:
	corehq/apps/reports/commtrack/psi_prototype.py
Merge pull request #640 from dimagi/commtrack

psi report tweaks
move commtrack reports to top of report list
Merge branch 'master' into ui-config
remove commented out code
add more robust handling of active tab for subtabs
add back accidentlly removed commtrack project settings links