rollback the chaos
Merge branch 'master' of github.com:eioeae/Estates

Conflicts:
	Estates.Web/Script/Pages/Estates/Show.js
Merge branch 'master' of github.com:eioeae/Estates

Conflicts:
	Estates.Web/Script/Pages/Estates/Show.js