Merge pull request #653 from mckillo/master

Improved mailer plugin & email by category v2
changed versionnr 1.9.5-1.9.6
fix sql error in 1.9.5.sql (issue #657)
line endings only - the only way to make my confused git happy

Sorry for that, but my git always expects Unix style on remote to make Windows style on my machine. Already having Windows style confuses git totally, no other way as commit. :-(
Merge pull request #658 from JKoelman/master

changed versionnr 1.9.5-1.9.6
also changed some class names from JEM... to Jem... (because class names are case insensitive in php there is no functional difference)
added mailtrigger to venue-controller
renamed events to venues (venue-controller)
Merge pull request #661 from JKoelman/master

added mailtrigger to venue-controller
default title and alias of jem_events table to '' (issue #662)
Merge branch 'master' of https://github.com/jemproject/JEM-Project