Upgrade paperclip with Star feature
Use starred attachments for main picture (fixes #1117)
Ability to edit attachments from detail pages directly (fixes #177, fixes #455, fixes #1164)
Upgrade mapentity
Merge branch '177_edit_attachments' into develop
Merge branch '1117_control_main_picture' into develop

Conflicts:
	conf/buildout.cfg
	docs/changelog.rst