Refactored MacroLoader into FileLoader.
Merge branch 'development' of https://github.com/OpenACCEL/OpenACCEL into development