Common games view
Merge branch 'dev' of https://github.com/deiga/Carpenter into dev