29 september fixes
30 september changes
Merge branch 'master' of github.com-fakhreev:maratfakhreev/pday_new

* 'master' of github.com-fakhreev:maratfakhreev/pday_new:
  29 september fixes

Conflicts:
	app/templates/layout.jade