Merge branch 'develop'
Merge branch 'develop'
clearing
update gitignore
Merge branch 'develop'
Merge branch 'develop'
clean
Merge branch 'develop'

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