Merge branch 'devel'

Conflicts:
	main/java/com/brentandjody/Translator/Formatter.java