lattice conf
Merge branch 'listlattice' of github.com:pholda/discats into listlattice

Conflicts:
	core/src/main/resources/application.conf