develop restored
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	browser-api/src/main/java/com/engagepoint/university/ep2013b/browser/api/CMISHelper.java