Changes to layout
Added line xml
New layout
Merge branch 'master' into polishedturd
Created new awesome layout
Merged new layout with master
Fixed compilation error