Fixed image uploads and noteTasks
Merge origin/master