committing feature2
committing the feature 2 changes.
Merge branch 'feature/feature2' into develop

Conflicts:
	src/main/app/EssentialsLab.xml