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
Merge pull request #12 from lvl0nax/37-brides

37 brides