Modied project maker to use existing demo project as a template
* Deleted old project templates. It would have been
  difficult to manage two templates per platform.
* Combined both Android.mk files.
* Updated GLFM and ok-file-formats.