fixed map picker element
Merge origin/master into amlak
Added Melk Subscribe Item