Deleted some crap, fixed assets grid
Merge branch 'metro' of https://github.com/fzumstein/assetjet into metro