Merge branch 'fp2-release' into fp2-dev-v2

* fp2-release:
  FP2-1215: Build fingerprint standards are not followed
diff --git a/project/fairphone.mk b/project/FP2.mk
similarity index 97%
rename from project/fairphone.mk
rename to project/FP2.mk
index d8d9ab6..e3dbda7 100644
--- a/project/fairphone.mk
+++ b/project/FP2.mk
@@ -2,7 +2,7 @@
 #
 LOCAL_DIR := $(GET_LOCAL_DIR)
 
-TARGET := fairphone
+TARGET := FP2
 
 MODULES += app/aboot
 
diff --git a/target/fairphone/include/target/display.h b/target/FP2/include/target/display.h
similarity index 100%
rename from target/fairphone/include/target/display.h
rename to target/FP2/include/target/display.h
diff --git a/target/fairphone/init.c b/target/FP2/init.c
similarity index 100%
rename from target/fairphone/init.c
rename to target/FP2/init.c
diff --git a/target/fairphone/meminfo.c b/target/FP2/meminfo.c
similarity index 100%
rename from target/fairphone/meminfo.c
rename to target/FP2/meminfo.c
diff --git a/target/fairphone/oem_panel.c b/target/FP2/oem_panel.c
similarity index 100%
rename from target/fairphone/oem_panel.c
rename to target/FP2/oem_panel.c
diff --git a/target/fairphone/rules.mk b/target/FP2/rules.mk
similarity index 100%
rename from target/fairphone/rules.mk
rename to target/FP2/rules.mk
diff --git a/target/fairphone/target_display.c b/target/FP2/target_display.c
similarity index 100%
rename from target/fairphone/target_display.c
rename to target/FP2/target_display.c
diff --git a/target/fairphone/tools/makefile b/target/FP2/tools/makefile
similarity index 100%
rename from target/fairphone/tools/makefile
rename to target/FP2/tools/makefile
diff --git a/target/fairphone/tools/mkheader.c b/target/FP2/tools/mkheader.c
similarity index 100%
rename from target/fairphone/tools/mkheader.c
rename to target/FP2/tools/mkheader.c