Pregled vseh ponudnikovih rezervacij
Merge branch 'master' of git://github.com/ragezor/TPO
Filter zaposlenih ne dela
Merge branch 'master' of git://github.com/ragezor/TPO
Zadnji dan
Vse rezervacije 0.1
Merge branch 'master' of git://github.com/ragezor/TPO
Seznam rezervacij 0.2
Merge branch 'master' of git://github.com/ragezor/TPO
Seznam rezervacij 0.3
Merge branch 'master' of git://github.com/ragezor/TPO
Merge pull request #44 from JonNatanael/master

Some changes to workinghours display and other minor stuff
Merge pull request #45 from JonNatanael/master

Fixed social login, again
Merge pull request #46 from JonNatanael/master

Added new translations, fixed search more, changed description css.
added export to mailchimp
Merge branch 'master' of github.com:ragezor/TPO

Conflicts:
	enarocanje/customers/views.py
	enarocanje/workinghours/views.py
disabled PJ url
Koledar rezervacij 0.8
Koledar rezervacij 0.8.1
Merge pull request #47 from ssimon92/master

Koledar z rezervacijami