change the layout of the main activity
Merge branch 'UI_branch' of https://github.com/justek-Wade/SmartHome.git into UI_branch