Validation & settings changes on Screens
Merge branch 'master' of github.com:WinnieT/rhc2013 into Winnie