added to austins fixing errors
***NOT STABLE***

added activity for end locations
screen for nfc done
AddCheckPoint GUI linked in
NFC done
NFC done (forgot to add the files last commit) and edu/ deleted
merge with mapping
fixed manifest file