Merge branch 'release/1.0.2.1' into develop
bumping version number
suppress compiler warnings
tooltips for view toggle
row sort indicator
scrollable resource preferences
updated undo/redo icons
losser reaction handling (may cause issues)
annotation order is fixed
loading excel does not default to web services (painfully slow on some connections)
clearing fields when a new dialog is opened
removed full screen option, this is broken in java 1.7
Options of save location and proxy settings
proxy preference configuration
maintain selection on update
ensure menus are updated on view change
only add Edit > Preferences when not on mac
description of how to load resources
tweaks to allow auto button creation
user interface for importing cross-references