Bug/324/delete layer not from server



<!---
@huboard:{"order":220.6245574951172,"milestone_order":328,"custom_state":"ready"}
-->