Merge pull request #1242 from sergey-berezin/master

More robust generation of timeline shortcuts. NULL user is allowed for t...
Fix default color settings for collection authoring and make skydrive images non-clickable
Move edit-collection constants to settings file
Merge pull request #1243 from javierluraschi/EditCollectionFixes

Fixes to collection authoring and skydrive images