Update.
Merge branch 'master' of https://github.com/trowski/Icicle

Conflicts:
	.gitignore
	phpdox.xml.dist
	phpunit.xml.dist