Обновление дерева в галереи
Merge branch 'master' into devel

Conflicts:
	cron.php
	offline/gallery/gallery.php
remove .idea
add .idea to ignore
fix bug update tree evets
fix bug update tree evets
fix bug update tree evets
fix bug update tree evets добавил картинку
Доработан гуи
Merge branch 'master' into devel

Conflicts:
	main.css
Исправление ошибок синхронизации дерева
Исправление ошибок синхронизации дерева
gallery: fix: no error status on empty tree_events into ajax response
gallery: change test msgs and append vimrc to some php/js
gallery: fix quiet reindex tree on page load
gallery: fix last hour updates
gal: append DEBUG=1 and several console.log()
gal: rebuild matrix on tree<->event resync
Merge branch 'gallery-sync' into master2
Merge branch 'master' into master2