add .git ignore file
add .git ignore file
Merge branch 'master' of github.com:vintsie/hbtw into dev

Conflicts:
	.gitignore
	pom.xml
modify ignore file
Merge branch 'dev'