Completed merge and fixed hac and configurator project set-up to properly load xml configuration files