added take survey view and controllers, updated survey factory Refs item:413
added second survey group Refs item:413
minor refactoring Refs item:413
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
minor fixes Refs item:413
minor setup survey UI fixes Refs item:413
Merge pull request #246 from jofomah/feature/facility-survey

Feature/facility survey