recycle bin update
Merge branch 'master' of https://github.com/joernroeder/nm-website

Conflicts:
	app/app/modules/RecycleBin.coffee
	app/app/modules/RecycleBin.js