clean...
clean
Merge branch 'develop'

Conflicts:
	.gitignore
Merge branch 'master' of github.com:rockagen/commons-lib