Fixed g++ warnings and edited Makefile to include ResourceManager