Fix for MSVC 2013 update 3 errors
Instead of events.hpp include cppcomponents.hpp and function.hpp
Merge branch 'master' of https://github.com/jbandela/cppcomponents into refactor_eliminate_cross_function