Fix doc links
Another doc link fix
Fix layout
Fix merge conflicts
Merge branch 'gh-pages' of https://github.com/strongloop/loopback.io into gh-pages

Conflicts:
	index.html