Merge branch 'angular'
Don't mangle my variables
Templatify