Changed Area Field type from Choicebox to Combobox
Changed Area Field in Customer
Dataentry from Choice box to Combobox

 this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
Added Area Database Dataentry
Added Area Database Dataentry(UI and Database)