Custom setting fix
Merge branch 'master' of https://github.com/globant/salesforce-training

Conflicts:
	src/classes/CreateSurveyController.cls
	src/classes/CustomController.cls
	src/classes/CustomLoginController.cls