Merge branch 'Ning'
deleted extra meta files
Merge branch 'master' into Ning
rescaled the trash can