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

Conflicts:
	.classpath
	.gradle/1.10/taskArtifacts/cache.properties
	.gradle/1.10/taskArtifacts/cache.properties.lock
	.gradle/1.10/taskArtifacts/fileHashes.bin
	.gradle/1.10/taskArtifacts/fileSnapshots.bin
	.gradle/1.10/taskArtifacts/outputFileStates.bin
	.gradle/1.10/taskArtifacts/taskArtifacts.bin
	.settings/org.eclipse.jdt.core.prefs
	.settings/org.eclipse.wst.common.component
	.settings/org.eclipse.wst.common.project.facet.core.xml
	src/main/resources/application.properties