Change-Id: I3e5e3dc443cb2654e13eb06a2de8c698dd541d92
Merge remote-tracking branch 'RTwUP_Core/master'

Conflicts:
	RTwUP/.classpath
	RTwUP/.settings/org.eclipse.jdt.core.prefs
	RTwUP/.settings/org.eclipse.wst.common.component
	RTwUP/.settings/org.eclipse.wst.common.project.facet.core.xml

Change-Id: Ibe1af164bd5c714315e2139014b9aef1d068ab0e


Change-Id: I8ebb41c2f52312116ae1a7310bc1facb7d7a9ef9
Merging master and MrGab-master
Merging master and MrGab-master