срап аватарки
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/financial/pyramid/service/impl/UserServiceImpl.java
	src/main/resources/i18n/messages_en.properties
	src/main/resources/i18n/messages_ru.properties
	src/main/webapp/resources/css/main.css
слияние переводов