Strings fix ups

Order was a little incorrect
Minor change to hippogridmanager.cpp
Apollo skin upkeep
Merge remote-tracking branch 'Lirusaito/Frosting' into Cupcake