Merge branch 'master' into Ning
game background and trash can

Improved the game background resolution and moved the trash can to a
better place
Merge branch 'Ning'
deleted extra meta files