Merge pull request #211 from xtech86/master

Add flatplus language string
JEvents 3.1.28
Fix for Joomla email cloak changes in 3.3.3
Merge origin/master
Merge remote-tracking branch 'upstream/master'
Added new config option to allow showing the Toolbar at the bottom and top when editing events.