Adding AppFog
fixing merge issue