Merge pull request #2283 from opf/fix/avoid_event_bubling_on_custom_field_admin

avoid event bubbling on custom field admin
Upgrade Angular to 1.3