#31 Added possibility of bit coin payments
Merge branch 'master' of github.com:godot/pasher

Conflicts:
	app/serializers/order_serializer.rb