moved builder-style setters into Builder inner class
added PictureTransaction
Merge remote-tracking branch 'upstream/master'