Battels.
Fixed notification settings hiding when notifications turned off

Fixes an issue where, if notifications are turned off, when returning to
settings page the notifications settings are not hidden.
Merge pull request #13 from jstockwin/hideNotificationSettingsFix

Fixed notification settings hiding when notifications turned off
Functional Battels
Changed order the of the options. Small aesthetic changes.
Handling Rotation
I can't remember what I changed.
Merge remote-tracking branch 'origin/development' into development
Merge jstockwin/settingsLayout