gmail password was public on github
Merge branch 'master' of https://github.com/jmadin/coraltraits

Conflicts:
	.gitignore
	solr/development/data/index/segments.gen