Merged with apm.augustineserver database and file edits to make it serve correctly