Task #125: Fixed merge conflict.
Merge branch 'dev' of github.com:InternetDevels/drupal.ua into dev