merged back
combined and minified sdk
fixed cookie issue
merged master