Logging update
Merge branch 'master' of github.com:ATLauncher/ATLauncher

Conflicts:
	src/main/java/com/atlauncher/data/Settings.java
	src/main/java/io/github/asyncronous/toast/Toaster.java