Update skeleton and template docs for navigation
Merge branch 'master' of git://github.com/networking/init-cms-bundle
Merge branch 'master' into 2.5