Renamed Controller to ServerLink
Merge branch 'gh-pages' of https://github.com/feupeu/JSONAPI-DOC into gh-pages

Conflicts:
	index.html