Merge branch 'fix_attr_function_calls' into develop

Conflicts:
	src/test_module.cpp

src/test_module.cpp

@@ -23,6 +23,7 @@ class TestBaseType
     const int const_val;
 
     int mdarray[2][3][5];
+    std::function<int (int)> func_member;
 
   private:
     TestBaseType &operator=(const TestBaseType &);
@@ -173,6 +174,8 @@ CHAISCRIPT_MODULE_EXPORT  chaiscript::ModulePtr create_chaiscript_module_test_mo
   // end array types
 #endif
 
+  // member that is a function
+  m->add(chaiscript::fun(&TestBaseType::func_member), "func_member");
   m->add(chaiscript::fun(&get_new_int), "get_new_int");