Changes made by Michael Veroukis (michaelv@imaginet.com).
Upgraded to newer AppBuilder
Merge commit 'd167c4f75fc285fd057cbe1bdd351da01a94b8cf'