Merge branch 'master' into next
Store Sones in “create Sone” page, for when there are no identities without Sone left.

This fixes #289.
Only show status update field if logged in.
Reformat.
Whitespace fix.
Add i18n to Sone insert notification.

This fixes #293.
Use Jackson to create JSON pages, get rid of utils-json dependency.
Add accessors for testing.
Add test for BookmarkAjaxPage.
Create local Sones when parsing local Sones.
Merge remote-tracking branch 'beak/next' into next
Fix unwrapping of the content map.
Fix rescue mode.
Make Sone of Sone inserter modifiable.
Insert a root album into all Sones to get rid of album manipulation in the Sone.
Ignore albums without inserted images when calculating the fingerprint.
Show number of albums in toString().
Use a custom container class instead of messing around with maps.
Show the album title correctly.
Add and implement Identified interface.