Added internal_links to API
Merge branch 'master' into roles

Conflicts:
	app/views/pages/show.html.erb