applied patch
fix tests
small fixes
remove merge left-over
fix field_form_set_state
get/set
fix menu links
user cancel confirm form fixed