Merge branch 'okina' into okina-mm-object

Conflicts:
        fem/bilininteg_ext.cpp
        general/mem_manager.cpp
	general/mem_manager.hpp
	general/occa.cpp

general/array.cpp

@@ -13,7 +13,7 @@
 // Abstract array data type
 
 #include "array.hpp"
-#include "../general/okina.hpp"
+#include "../general/forall.hpp"
 #include <fstream>
 
 namespace mfem