adding cipher support for titanium
adding support for include_token in history api
passing heartbeat url param with each hb
merging staging-3.6.0