Merge branch 'master' into 123_1
Merge branch '120'
Merge branch 'master' into 117
Task #125: Changed reset password redirect.
Task #104: Fixed merge conflict
Merge branch 'master' of github.com:InternetDevels/drupal.ua into 125

Conflicts:
	sites/all/modules/custom/user_profile/drua_profile/drua_profile.module
	sites/all/themes/idevels/scripts/scripts.js
	sites/all/themes/idevels/styles/styles.css
	sites/all/themes/idevels/template.php
Merge branch '125' into dev

Conflicts:
	sites/all/modules/custom/user_profile/drua_profile/drua_profile.module
	sites/all/themes/idevels/scripts/scripts.js
	sites/all/themes/idevels/styles/styles.css
	sites/all/themes/idevels/template.php