Merge pull request #60 from ssimon92/master

Zadnja razlicica
added xls support
Form fixes
Merge pull request #61 from JonNatanael/master

Form fixes
reg error form showup fix
Fixed calendar for weekview
Form fix.
Confirmation bug fix.
Merge pull request #62 from JonNatanael/master

Fixes
reservation count, unique key count
Merge branch 'master' of github.com:ragezor/TPO

Conflicts:
	enarocanje/reservations/models.py
removed mail blockade
Small fix.
Merge pull request #63 from JonNatanael/master

Small fix. another.
enabled mail
Merge pull request #64 from JonNatanael/master

enabled mail
Fixed bugs with calendar
Merge remote-tracking branch 'origin/master'
Merge pull request #65 from JonNatanael/master

Fixed bugs with calendar
Fixed for single employee