pre merge master
aligning feature to current master record

Merge branch 'master' into AccountControl
UI tweaks, spec fixes
User awareness on ux according to regular expressions
Bringing latest account control in line with latest master

Merge branch 'master' of github.com:luke-dr/oso into AccountControl
Latest master integrated