Merge branch 'master' into angular_1.2
Added htmlmin
Merge branch 'angular_1.2'