fixed log error in ata model
Merge origin/master into amlak
fixed melk controller