refactoring
Merge branch 't6_ajax-datepicker' into t8_tag
ticket:8 refactoring