Committing new mavenized structure.
Adding .gitignore file.
Merging branches.
Merging branches.