reworked inbox
Merge pull request #404 from trigun0x2/staging

reworked inbox
Merge remote-tracking branch 'upstream/master' into bracket

Conflicts:
	app/models/deck.rb