Finished upload picutres
Merge branch 'dev' into uploadPhotos
Added textfield