Merge "Updated pom files, added concepts component"