add image via upload or url working
merged with master