Merge pull request #1 from MahyarJ/master

first fork from pouria
Merge pull request #2 from MahyarJ/master

resolve dead-body on picture uploader
little fix on maghaze
Merge branch 'master' of https://www.github.com/pouriaMaleki/iranamlak2
search query and ui done
Merge pull request #3 from MahyarJ/master

resolve loading ajax geolocations in add-content
Merge branch 'master' of https://www.github.com/pouriaMaleki/iranamlak2