Testing branch commit

Test only
Merge branch 'VEC-Application'

Conflicts:
	index.php