1st Commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	MountiesGaming/app/src/main/java/com/ewah/mountiesgamingocc/ParseApplication.java