Organise imports.
Merge branch 'master' of https://github.com/temenostech/IRIS

Conflicts:
	interaction-core/src/test/java/com/temenos/interaction/core/hypermedia/expression/TestResourceGETExpression.java
	interaction-core/src/test/java/com/temenos/interaction/core/rim/TestResponseHTTPHypermediaRIM.java
Seems xtend dependency should match xtext version.