Fix for Converter bug
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/github/theresajayne/tranquility/common/ConverterImpl.java