fixing conflict
Merge branch 'master' of https://github.com/DulcyTeam/VineScopeClient

Conflicts:
	VineScope/js/datalayer.js