add redis settings
add redis settings
update queue manager progress ...
update queue manager progress ...
start worj with rss front
start worj with rss front
test
merge
XMerge branch 'service_rss' of https://github.com/mueees/birthday into service_rss
del
merge
work with front menu view
fix styly and upload
Merge branch 'service_rss' of https://github.com/mueees/birthday into service_rss
Merge branch 'service_rss' of https://github.com/mueees/birthday into service_rss

Conflicts:
	.gitignore
	app/config/main.json
	app/libs/logRequest.log
	app/models/rss/feed.js
	app/models/rss/post.js
	app/public/js/app/templates/menu/MenuView.html
	app/routes/websocket.js
	app/services/index.js
	app/services/rss/index.js
	app/services/rss/updateFeedWorker.js
	app/services/rss/updateQueueManager.js
	app/services/rss/worker.js
add plugin for ckeditor
work with file browser
work with file borwser
add icon to file browser
comment access