11
Merge branch 'master' of https://github.com/cronon/SmartReserve

Conflicts:
	db/schema.rb
scaffold for orders tokens