Updated .gitignore
Updated pom.xml
Updated settings
Merge commit 'c888b9995c542e6c29f4b489d8f5078bdb79b280'

Updates from subproject.
Merge commit '011b436b83f6604bb0fa9cfd663e55ce960b7996'

Updates from subproject.
Merge commit '0f71da560e7cc9ee3988fa38bdc6d90782a242ad'

Updates from subproject.