update some help text. needs more work.
add some fields to be autocompleted
eclipse config. add custom data page
automerging. I have no idea why this is necessary.

Merge branch 'dev' of github.com:Arabidopsis-Information-Portal/intermine into dev