resolve conflicts
Merge branch 'development' of https://github.com/kevingcfcb88/sicmec.git
into development

Conflicts:
	.settings/org.eclipse.jdt.core.prefs
	.settings/org.eclipse.wst.common.component