new strucrure
delete all images
new master
added some fields to user
change slide img for sberbank
Merge branch 'master' into master+admin

Conflicts:
	viastore-db/src/main/java/com/viastore/db/entities/User.java
	viastore-service/src/main/java/com/viastore/service/dto/user/UserPersonal.java
	viastore-service/src/main/resources/mappings.xml
	viastore-web/src/main/webapp/admin/index.html
	viastore-web/src/main/webapp/admin/js/Tools.js
	viastore-web/src/main/webapp/admin/js/account/config.js
	viastore-web/src/main/webapp/admin/js/account/layout/footer.js
	viastore-web/src/main/webapp/admin/js/account/layout/nav.js
	viastore-web/src/main/webapp/admin/js/account/page.js
	viastore-web/src/main/webapp/admin/js/account/settings/userSettings.js
	viastore-web/src/main/webapp/admin/js/account/tabs/chat.js
	viastore-web/src/main/webapp/admin/js/account/tabs/constructor.js
	viastore-web/src/main/webapp/admin/js/account/tabs/fileManager.js
	viastore-web/src/main/webapp/admin/js/account/tabs/settings.js
	viastore-web/src/main/webapp/admin/js/account/tabs/settings/change.js
	viastore-web/src/main/webapp/admin/js/account/tabs/settings/history.js
	viastore-web/src/main/webapp/admin/js/account/tabs/settings/profile.js
	viastore-web/src/main/webapp/admin/js/account/tabs/settings/projects.js
	viastore-web/src/main/webapp/admin/js/account/tabs/statistics.js
	viastore-web/src/main/webapp/admin/js/app.js
	viastore-web/src/main/webapp/admin/js/login/config.js
	viastore-web/src/main/webapp/admin/js/login/page.js
	viastore-web/src/main/webapp/admin/js/login/tabs/forgot.js
	viastore-web/src/main/webapp/admin/js/login/tabs/login.js
	viastore-web/src/main/webapp/admin/js/login/tabs/register.js
	viastore-web/src/main/webapp/admin/js/router.js
	viastore-web/src/main/webapp/admin/js/starter.js
	viastore-web/src/main/webapp/admin/pages/account/index.html
	viastore-web/src/main/webapp/admin/pages/login/index.html
	viastore-web/src/main/webapp/admin/resources/css/account/main.css
	viastore-web/src/main/webapp/admin/resources/css/account/nav.css
	viastore-web/src/main/webapp/admin/resources/css/account/settings.css
	viastore-web/src/main/webapp/admin/resources/css/account/settings/profile.css
	viastore-web/src/main/webapp/admin/resources/css/login/form.css
	viastore-web/src/main/webapp/admin/resources/css/login/main.css
	viastore-web/src/main/webapp/admin/resources/css/login/nav.css
	viastore-web/src/main/webapp/admin/resources/less/colorMap.less
	viastore-web/src/main/webapp/admin/resources/less/default.less
	viastore-web/src/main/webapp/admin/resources/templates/account/chat.tmpl
	viastore-web/src/main/webapp/admin/resources/templates/account/constructor.tmpl
	viastore-web/src/main/webapp/admin/resources/templates/account/content.tmpl
	viastore-web/src/main/webapp/admin/resources/templates/account/fileManager.tmpl
	viastore-web/src/main/webapp/admin/resources/templates/account/footer.tmpl
	viastore-web/src/main/webapp/admin/resources/templates/account/nav.tmpl
	viastore-web/src/main/webapp/admin/resources/templates/account/settings.tmpl
	viastore-web/src/main/webapp/admin/resources/templates/account/settings/change.tmpl
	viastore-web/src/main/webapp/admin/resources/templates/account/settings/history.tmpl
	viastore-web/src/main/webapp/admin/resources/templates/account/settings/profile.tmpl
	viastore-web/src/main/webapp/admin/resources/templates/account/settings/projects.tmpl
	viastore-web/src/main/webapp/admin/resources/templates/account/statistics.tmpl
	viastore-web/src/main/webapp/admin/resources/templates/login/forgot.tmpl
	viastore-web/src/main/webapp/admin/resources/templates/login/register.tmpl
	viastore-web/src/main/webapp/common/css/common.css
	viastore-web/src/main/webapp/common/css/modal.css
	viastore-web/src/main/webapp/common/css/reset.css
	viastore-web/src/main/webapp/common/js/config/config.js
	viastore-web/src/main/webapp/common/js/libs/less-1.3.3.min.js
	viastore-web/src/main/webapp/common/js/plug/fileUpload.js
	viastore-web/src/main/webapp/common/js/plug/modal.js
	viastore-web/src/main/webapp/common/js/plug/templates.js
	viastore-web/src/main/webapp/common/less/common.less
	viastore-web/src/main/webapp/projects/viastore/js/libs/backbone.js
	viastore-web/src/main/webapp/projects/viastore/resources/images/upload/sber-large.png
	viastore-web/src/main/webapp/projects/viastore/resources/images/upload/sber-small.png
	viastore-web/src/main/webapp/projects/viastore/resources/less/main.less
	viastore-web/src/main/webapp/resources/less/main.less
save personal data