fix merge conflicts
add form documentation & update service docs
Merge branch 'master' of github.com:blue-kite/developer.bluekite.com