Merge branch 'devel'

Conflicts:
	main/java/com/brentandjody/Translator/Formatter.java
Merge branch 'master' into devel

Conflicts:
	main/java/com/brentandjody/Translator/Formatter.java
Merged with master