Merge from branch_release_20140410
GCP-8050
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/org/generationcp/ibpworkbench/actions/RestoreIBDBSaveAction.java
GCP-8050
GCP-8327 (ui bug fix)
GCP-8331