Update ApplicationController.cls
Test
Merge branch 'master' into develop

Conflicts:
	SFTest/src/classes/ApplicationController.cls