Merge pull request #245 from jofomah/feature/facility-survey

Feature/facility survey
Adds basic stock count graph, see item:378
Split chart and main activities into views
Add stock count bar chart
Remove logging
Restore appConfig hack, see ebc9f1f058
Update main activity state name
Merge pull request #237 from tlvince/feature/stock-level-graphs

Second iteration of stock count graph
Merge branch 'upstream-develop' into feature/facility-survey

Conflicts:
	app/scripts/controllers/home.js
resolved conflict after merging upstream Refs item:413
added locale UI texts and minor fixes Refs item:413