version bump 1.5.0

Merge branch 'master' of github.com:drhenner/ror_ecommerce

version bump

Version Bump 1.4.2

Version bump.. 1.4.1 (remove Blueprint CSS)

Bump version for Rails 3.2.11 working!

inverse logic for active

Version bump! 1.2.1

Merge branch 'master' of github.com:drhenner/ror_ecommerce

Conflicts:
	Gemfile
	app/views/admin/merchandise/products/show.html.erb

Update Change Log. V 1.0.0 RELEASED