more
more
Merge branch 'master' of github.com:springfuse/springfuse.github.com

Conflicts:
	change-log.md