datepicker
Merge branch 'master' of https://github.com/meksico/volyaCabinet_ver1
datepicker
Merge branch 'master' of https://github.com/meksico/volyaCabinet_ver1

Conflicts:
	stylesheets/style.css
	tpl/_popup.html.erb
Merge branch 'master' of https://github.com/meksico/volyaCabinet_ver1
Merge branch 'master' of https://github.com/meksico/volyaCabinet_ver1
Merge branch 'master' of https://github.com/meksico/volyaCabinet_ver1

Conflicts:
	stylesheets/style.css
	tpl/_popup.html.erb
Merge branch 'master' of https://github.com/meksico/volyaCabinet_ver1
popup31