3.1.0 release

Also throw in Moto G4 (harpia) and G3 (osprey)

Change-Id: Ibaf37314df8b88c16bb0bfbd218cc324c3f3b8ed
diff --git a/_devices/motorolamotog2016.markdown b/_devices/motorolamotog2016.markdown
index d7ccde2..78fe8c5 100644
--- a/_devices/motorolamotog2016.markdown
+++ b/_devices/motorolamotog2016.markdown
@@ -1,10 +1,10 @@
 ---
 layout: device
 title:  "Motorola Moto G 2016"
-codename: athene
-downloadfolder: athene
+codename: harpia
+downloadfolder: harpia
 supportstatus: Current
-maintainer: yeshwanthvshenoy, pranav01
+maintainer: Dees_Troy
 oem: Motorola
 ---