test
Merge https://github.com/XaroRSA/event

Conflicts:
	event_controller.php
	event_list.php
	event_model.php
	event_schema.php
	event_settings_view.php
	scripts/phpmailer/docs/makedocs2.sh
	scripts/prowlphp/example.php
	scripts/prowlphp/prowlSend.php
	scripts/prowlphp/xenji-ProwlPHP-3a2fe1e/example.php
	scripts/twitter/twitter-api-php/TwitterAPIExchange.php
	scripts/twitter/twitter-api-php/index.php