Merging
Merge branch 'master' of http://github.com/orothred/Toolbox.git

Conflicts:
	Toolbox/files/Toolbox.logging