Fixing some stuffs
Merge branch 'master' of github.com:Oncedev/ProgrammingEvents

Conflicts:
	ProgrammingEvents.userprefs