Merge branch 'master' of https://github.com/JohanEks/testrepo
Added timing logs and cleaned out unused stuff
Merge remote-tracking branch 'origin/master' into layout