.
Merge branch '2.0' of github.com:9seeds/wp-event-ticketing into 2.0

Conflicts:
	lib/Payments.class.php