Cleaned up some of the errors and syntax to donator commands
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
Merged local branch and upstream