CMS
gitignore
gitignore
Merge branch 'master' of https://github.com/calmitdev/common

Conflicts:
	.gitignore
	Common/fpml-adapter/.gitignore
rm .classpath