realease
for demo
pre demo versionn
demo
demo
master
Merge branch 'origin/master'

Conflicts:
	.gitignore
	core/pom.xml
	pom.xml
	web/pom.xml
	web/src/main/webapp/WEB-INF/web.xml