Merge pull request #1 from JEvents/master

Getting updated after honeymoon
Merge pull request #2 from JEvents/master

Language updates
Merge pull request #3 from JEvents/master

Updating master branch
Merge branch 'master' of github.com:JEvents/JEvents
Added translation credits
added deprecated language
Merge branch 'master' of github.com:JEvents/JEvents
Fixing Translation Credits for handling several translators
Merge pull request #26 from carcam/master

Added translation credits and deprecated language files
v 3.0.5 - fix end date specification when not using yyyy-mm-dd date formate
Fix checkconflicts for mulit-category events
Merge Tony's config options
Make translation credit tag conditional on there being a value set and not to display it in English
Jevents v 3.0.6 - multi-categories were being lost during an upgrade :(
Resolved Conflict, accepted upstream changes and committed.