general renaming
changed build order
Merge branch 'master' of https://github.com/pwambach/angular-canvas-painter