Changes made by MobileCraft Enterprise with Annual Subscription (e2etapenterpr@telerik1.com).
Merge branch 'master' of https://github.com/Vlao85/vc-conflicts-test.git

Conflicts:
	vz-test-vc-conflicts/css/index.css
	vz-test-vc-conflicts/index.html
	vz-test-vc-conflicts/js/index.js
Merge branch 'master' of https://github.com/Vlao85/vc-conflicts-test.git

Conflicts:
	vz-test-vc-conflicts/index.html
Merge branch 'master' of https://github.com/Vlao85/vc-conflicts-test.git

Conflicts:
	vz-test-vc-conflicts/index.html