country changes2
Merge branch 'master' of https://github.com/pradeepnarava/facebo

Conflicts:
	app/models/ticket.rb~
	app/views/orders/index.html.erb
	app/views/orders/index.html.erb~
country changes