cene, emaili, slike, drugi popravki
popravki mailer
Merge branch 'master' of heroku.com:prodajalna-paola

Conflicts:
	app/controllers/application_controller.rb
	config/environments/development.rb
head fix
fix
ureajnje artiklov fix
Postnina
paramms fix
display index
no image prod
no image prod
no image prod
no image prod
order by products
master slike
assets
precompile
b
precompile
precompile