Include sample in top level rake test and test_app
Merge branch 'test_sandbox' of github.com:jhawthorn/spree

Conflicts:
	Rakefile