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

Conflicts:
	.DS_Store
	spree_yoyo_theme/app/assets/stylesheets/admin/spree_yoyo_theme.css
	yoyoburger/.DS_Store
	yoyoburger/db/development.sqlite3
	yoyoburger/log/development.log