Adding angular init
Updating to latest version of the framework, adding latest version of Spottkick, and adding viking.js in templates
merging