Fix add/remove tags
Merge branch 'develop' of https://github.com/Z-Wave-Me/home-automation into develop