Updated Makefile to remove explicit listing of ASaP cpp files
Updating CMakeLists.txt with new locations of ASaP files (UNTESTED)
Merge branch 'asp' into dev/prolog