Image picker added
Merge branch 'tlvs1' of github.com:devrandom/Gibberbot into tlvs1