.
.
Merge branch 'master' of https://github.com/SimpleUsername/ticket-sys
.
...
Merge branch 'master' of https://github.com/SimpleUsername/ticket-sys

Conflicts:
	application/controllers/controller_events.php
	application/views/events_add_view.php
	application/views/events_edit_view.php
	application/views/main_view.php
	js/my.js
prices