Banner design, map design, mail conf
Banner, map design & mail conf
Merge branch 'master' of https://github.com/khcr/resj

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