h
Merge remote-tracking branch 'origin/master'

Conflicts:
	sellerportal/src/main/webapp/WEB-INF/views/cabinet/personal.jspx