Assets for icons/images
Fixed android build issues with res.
Fixed bug where task completion not going through.
merge from core/dev