Stop tracking target folders
Users and Groups
CV Workflow
Styles for CV and Contact Us
Stop tracking target folders
Merge branch 'master' of https://github.com/alejandronanez/discostore2

Conflicts:
	discostore-services/target/classes/META-INF/MANIFEST.MF
	discostore-services/target/discostore-services-1.0.0-SNAPSHOT.jar
	discostore-services/target/scr-plugin-generated/OSGI-INF/scr-plugin/scrinfo.xml
	discostore-services/target/scr-plugin-generated/OSGI-INF/serviceComponents.xml