artf668151 - JnJ UI Simplification
Merge branch '2.3.0' of https://github.com/phresco/framework into 2.3.0