adding composer.lock
echo msg
batch file
batch file
batch file
batch file
develop test
Merge branch 'master' into develop

Conflicts:
	index.php