something changed
Merge remote-tracking branch 'origin/master'

Conflicts:
	VineScope/js/viewmodels.js