Develop

merging develop into master (changes include, image uploading and share buttons)