clean_up
Merge branch 'develop' of https://github.com/synapticon/sc_somanet-base into develop