some cloudcode functionality added
fixed conflicts