Clean
AngularJS port
Merge branch 'angular' into dev