Merge pull request #143 from dupon21/master

fix redirect in loginAction
Merge branch 'master' of https://github.com/bstrx/doorlog

Conflicts:
	protected/views/Users/index.tpl
calendar
correct button
corrected calendar and buttons
bugs date
change design reports
add new template
Merge pull request #144 from dkonurov/master

calendar holidays
Merge github.com:bstrx/doorlog
Merge pull request #145 from cherkasovas/master

timeoffs update
small correct
correct bugs
Merge pull request #147 from cherkasovas/master

correct
full complete =)
sorry, last commit
delete print
corrected bugs $num
correct
Merge pull request #148 from dkonurov/master

holidays bugs fixed