Merge branch 'master' of C:\!Aspire\ICT\sommerschool\SommerSchool2014\GitHub\Android-SmartHouseControl with conflicts.
new layouts
new layout