rearranging
Merge branch 'master' of https://github.com/xedoc/Ubiquitous2.git