Fixes from NI branch committ

Updates to vols and formsmarts
fix conflict

Conflicts:
	scripts/controllers/volunteer.js