- implemented navigation with slug
- merge
Merge origin/master

Conflicts:
	src/main/webapp/WEB-INF/templates/frontend/grids/grid-playlists.xhtml
	src/main/webapp/WEB-INF/templates/frontend/grids/grid-tutorials.xhtml