delete
Merge remote-tracking branch 'origin/master' into bata-1