navigation commit
Merge branch 'master' of https://github.com/DulcyTeam/VineScopeClient

Conflicts:
	VineScope/pages/video/video.html