added build xml
Merge branch 'dev' of https://github.com/ul-arch/git-study into feat1
changed build xml
added lin as part of feat1 branch
Merge branch 'feat1' into dev

Conflicts:
	file2