add #include <algorithm> in includes.h.
Merge branch 'properties' into my_branches