initial code
Merge branch 'master' of github.com:cosmocode/confmanager

Conflicts:
	.gitignore
fix icon display problem