Angular template update
Merge remote-tracking branch 'upstream/master'
Merge and model related names fix
Merge pull request #22 from jank0s/master

Merge and model related names fix