Added merging of decks

* Users can now merge decks
* New layout for email notifications
* When message is already read, mark_as_read does nothing