Merge branch 'master' of stigma:platforma

Conflicts:
	project/static/js/models.js

diff --cc project/static/js/models.js
index f6725a5,13dc2ea..5d3fac4
--- 1/project/static/js/models.js
--- 2/project/static/js/models.js
+++ b/project/static/js/models.js
@@@ -204,15 -208,7 +209,15 @@@ Editor.ImageGalleryModel = Editor.Model
        alert('erroneous state:', this.get('state'));
      }
  
 -    this.set('pages', data[0].pages);
 +    $.log('galleries:', data);
 +
 +    if (data.length == 0)
 +        this.set('data', []);
 +    else {
 +        $.log('dupa');
 +        this.set('data', data[0].pages);
-     }
-     
++    }  
++
      this.set('state', 'synced');
    },