version to 2.1.1
added config
upgraded moskito-version to latest snapshot
merged changes from dvayanu
Merge remote-tracking branch 'dvayanu/master'

Conflicts:
	pom.xml