reworked build system, using angular cdn now
Merge remote-tracking branch 'origin/master'