Merge pull request #32 from km4054/feature-controllers

Kontrolerji
Merge pull request #33 from km4054/feature-controllers

New trade controller
user list style
Merge pull request #34 from domc/master

user list style
Merge pull request #36 from km4054/feature-controllers

Feature controllers
fixed mytrades filter
Merge pull request #37 from domc/master

fixed mytrades filter
heroku
heroku2
user-view style+few adds
heroku
Merge pull request #38 from domc/master

user-view style+few adds
Merge branch 'master' of https://github.com/ipriKGD/projekt into feature-controllers
myprofile update
Merge pull request #39 from domc/master

myprofile update
Merge branch 'master' of https://github.com/ipriKGD/projekt into feature-controllers