Merge branch 'dev' of github.com:lvl0nax/topaza into 37-brides

Conflicts:
	app/uploaders/picture_uploader.rb