..
...
merged conflict
...
 added in pairing support
...
touch ups and mobile enabled
Merge branch 'master' into tablet-client
...