LANGNAME
Merge branch 'master' of https://github.com/zwvista/LollySwing

Conflicts:
	.gitignore
	src/main/resources/hibernate.cfg.xml