Added :id option to click_to_edit helper
Upped version to 1.0.7
Fixing merge conf