Merge origin/master

Conflicts:
	realestates/web/header.jsp
	realestates/web/login.jsp
	realestates/web/logout.jsp
	realestates/web/register.jsp
	realestates/web/static/css/general.css
	realestates/web/static/js/general.js
	realestates/web/validate.jsp
	realestates/web/validate_login.jsp
Merge origin/master

Conflicts:
	realestates/web/header.jsp
	realestates/web/login.jsp
	realestates/web/logout.jsp
	realestates/web/register.jsp
	realestates/web/static/css/general.css
	realestates/web/static/js/general.js
	realestates/web/validate.jsp
	realestates/web/validate_login.jsp