Feature/106/hide show features



<!---
@huboard:{"order":20.5625,"milestone_order":167,"custom_state":"ready"}
-->