Merge pull request #1 from AshishArunWaghmare/master

Update ApplicationSettingsController.cls
Update ApplicationSettingsController.cls
Merge pull request #3 from AshishArunWaghmare/child

Child