Update Upstream.
Build: Have controllers and templates in the same file.
Build: Minimize build file.