Merge remote-tracking branch 'origin/develop' into features/JAL-2316

author kiramt <k.mourao@dundee.ac.uk>

Thu, 26 Jan 2017 11:40:39 +0000 (11:40 +0000)

committer kiramt <k.mourao@dundee.ac.uk>

Thu, 26 Jan 2017 11:40:39 +0000 (11:40 +0000)
author kiramt <k.mourao@dundee.ac.uk>
Thu, 26 Jan 2017 11:40:39 +0000 (11:40 +0000)
committer kiramt <k.mourao@dundee.ac.uk>
Thu, 26 Jan 2017 11:40:39 +0000 (11:40 +0000)
diff --cc resources/lang/Messages.properties
Simple merge
diff --cc src/jalview/appletgui/APopupMenu.java
Simple merge
diff --cc src/jalview/gui/Desktop.java
Simple merge
diff --cc src/jalview/gui/Preferences.java
Simple merge
author	kiramt <k.mourao@dundee.ac.uk>
	Thu, 26 Jan 2017 11:40:39 +0000 (11:40 +0000)
committer	kiramt <k.mourao@dundee.ac.uk>
	Thu, 26 Jan 2017 11:40:39 +0000 (11:40 +0000)
		1	2
resources/lang/Messages.properties	patch \|	diff1 \|	diff2 \|	blob \| history
src/jalview/appletgui/APopupMenu.java	patch \|	diff1 \|	diff2 \|	blob \| history
src/jalview/gui/Desktop.java	patch \|	diff1 \|	diff2 \|	blob \| history
src/jalview/gui/Preferences.java	patch \|	diff1 \|	diff2 \|	blob \| history