Removed binvox binaries from octomap source
Updated READMEs with new code / doc locations
Documentation updates
.gitignore html/ folder (contains gh-pages branch)
valgrind output to .gitignore
Changelog for 1.5.4 release
Merge branch 'v1.5-fixes' for release
Fix: increased version in CMakeLists to 1.5.4
Merge branch 'v1.5-fixes'
Merge branch 'devel' (1.6.0 release)

Conflicts:
	octomap/CHANGELOG.txt
	octomap/CMakeLists.txt
Merge remote-tracking branch 'upstream/master' into devel