articles extended
Merge remote-tracking branch 'origin/master'

Conflicts:
	web/src/main/java/ua/com/jon/cabinet/server/TasksServiceImpl.java