Stabilized dependencies. Form type fixes.
Stabilized dependencies. Unit tests OK. UI still needs fixes.
Merge origin/master