renaming id names to follow convention
escaping apostrophe in strings.xml

fixing the illegal floating apostrophe in strings.xml
Merge github.com:ldanielw1/cs160-mSpray