primer commit
arreglando el gemfile
Merge branch 'master' of https://github.com/openjaf/spree_fancy_menu

Conflicts:
	Gemfile
	spree_fancy_menu.gemspec