Add missing header include <functional>
Use FindBoost to locate correct versions of boost libraries
Merge branch 'develop'