update gitignore
update config.properties
Merge branch 'master' of https://github.com/dev0x10/lucene-sample

Conflicts:
	src/main/webapp/WEB-INF/config.properties