picker added
Picker worked now =D
fixed some small things
Merge branch 'feature/Picker' into develop
Fixed picker