ankoma88 changes for
http://jira.javacourses.kiev.ua:8080/browse/AUTOPOSTER-7
Merge remote-tracking branch 'origin/master'