git ant test 1234
Merge branch 'master' of https://github.com/Jjarve/Cervisiam

Conflicts:
	POS/build.xml