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

Conflicts:
	VineScope/js/viewmodels.js
	VineScope/pages/searchresults/searchResults.js
broken commit