Sync with master
Fix: Missing <base> tag fails the router
Fix: Missing semicolon
Fix AngularJS templating build problems