admin colors changed
Merge branch 'master' of https://github.com/obates/yoyoSpree

Conflicts:
	yoyoburger/tmp/cache/1F6/2D1/spree%2Fapp_configuration%2Fdefault_country_id
	yoyoburger/tmp/cache/E69/490/spree%2Fbackend_configuration%2Flocale
	yoyoburger/tmp/cache/assets/development/sprockets/5b65ab2024cb3263a4e10523e67b29e2
	yoyoburger/tmp/cache/assets/development/sprockets/6dda730f2bdc2ec9319598daa0e6682d
	yoyoburger/tmp/cache/assets/development/sprockets/8aae2d3b47e5317d72c520c8deacd3ae
	yoyoburger/tmp/cache/assets/development/sprockets/9560404af56ab8ba07c4b9e390ef42cc
	yoyoburger/tmp/cache/assets/development/sprockets/be0a5564c3ed668c6b2db01107893a66
	yoyoburger/tmp/cache/assets/development/sprockets/dad29525da11afc4aaa29a596b310138