Merge pull request #1284 from mahagr/2.0

Fix #1260, #1278, #1281, #1271, #1279
Merge pull request #1285 from mahagr/2.0

Fix #1066: Can't delete trashed items
Merge pull request #1286 from mahagr/2.0

Fix #1221, CSS improvement for file input box, Copyright update to 2013