emove Maven from the build. Now pure Gradle build.
Beginnings of Ugly in Angular.
Update merge from local master.