changed makefile
changed makefile
added FCMSImage and thumbnail generating capability
merged changes, fixed conflicts
fixed makefile