merged with 2.1.1-rc inclding deactivate detectr and receiver

This commit is contained in:
Dhanya Maliakal
2016-10-04 14:06:47 +02:00
9 changed files with 226 additions and 531 deletions