Merge branch 'master' into playground
Added app routing through router.js
UI adjustments
Templating needed BADLY :(
Merge branch 'playground'