Developing Real Estate engine and fixing errors and beautifying code in a lot of files
Merge origin/master

Conflicts:
	config.php