Merge branch 'master' into im_und_export

unittests/example_labfolder_data/static/css/notebook.css

unittests/example_labfolder_data/static/css/pixel_icon.css

unittests/example_labfolder_data/static/css/redactor.css

unittests/example_labfolder_data/static/css/tree.css

unittests/example_labfolder_data/static/font/icons11.eot

unittests/example_labfolder_data/static/font/icons11.svg

unittests/example_labfolder_data/static/font/icons11.ttf

unittests/example_labfolder_data/static/font/icons11.woff

...ests/example_labfolder_data/static/font/redactor-font.eot

unittests/example_labfolder_data/static/img/favicon2.ico

...sts/example_labfolder_data/static/img/labfolder_icons.png

unittests/example_labfolder_data/static/img/squares.png

...ests/example_labfolder_data/static/js/jquery-1.8.2.min.js

unittests/example_labfolder_data/static/js/jquery-ui.js

...ests/example_labfolder_data/static/js/labfolder-global.js

unittests/example_labfolder_data/static/js/tree.js

unittests/example_labfolder_data/templates.html

...es/My private templates_0/118218_test_template/index.html

...plates/My private templates_0/118219_template2/index.html

...mplates_0/118219_template2/labfolder_table_4625184_3.xlsx