ticket:6 fix
Merge branch 't6_ajax_and_datepicker' into t8_custom_tag