new instagram api app
merged conflicts