* add configuration
* remove configuration

* added pair designer test
Merge remote-tracking branch 'origin/touch_s' into touch_s