From 3af10a6b970e37b9895bd354852163e9c0c6b256 Mon Sep 17 00:00:00 2001
From: Jay Jay Billings <billingsjj@ornl.gov>
Date: Wed, 15 Apr 2015 11:20:24 -0400
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into
 jay/reflectivity

Conflicts:
	src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEResourcePage.java

Signed-off-by: Jay Jay Billings <billingsjj@ornl.gov>