Merge branch 'EventReporting' into eventserver-gui-gen

# Conflicts:
#	protected/commands/Migrate_old_dbCommand.php
#	protected/messages/it/untranslated/app.php
