Manually updated branch to LayoutEdits branch
Merge pull request #2 from davidilgenfritz/master

Manually updated branch to LayoutEdits branch