error commit
Merge remote-tracking branch 'origin/encryption'

Conflicts:
	bin/jarlist.cache
Fixed theme bugs
Merge branch 'master' into encryption