added fields to user profile
Merge remote-tracking branch 'origin/master'

Conflicts:
	estate/protected/runtime/application.log
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
added fix to maps in tabs, user profile fixes