Merge branch 'master' into newDevBranch
initial ngroute
loads
before big changes
add partial
refactor of routing
Merge branch 'newDevBranch'