Changed a few defines into weak type enums.
These should eventually be changed into strong type enums,
in order to provide type safety!
Merge remote-tracking branch 'upstream/master' into enums

Conflicts:
	src/settings.cpp
Merge pull request #86 from Skeen/enums

Change defines into enums