Merge pull request #11 from Neodelf/dev

added dress and dress_consist models
adding front end and backend for brides
adding front end and backend for brides
Merge branch 'dev' of github.com:lvl0nax/topaza into 37-brides

Conflicts:
	app/uploaders/picture_uploader.rb
Merge branch 'dev' of github.com:lvl0nax/topaza into 37-brides

Conflicts:
	app/uploaders/picture_uploader.rb
cosmetic fix
update rails
Merge pull request #12 from lvl0nax/37-brides

37 brides
Merge pull request #13 from lvl0nax/update-rails

update rails
create dresses#show