Unbreak the build :)
Merge branch 'dev' - unbreak the build
Update the compiled javascripts and typing files