Master branch defaults to live
Merge branch 'dev'
Remove setPreviewSize - caused a problem on some HTC devices
Bump version to 1.0.4/1004
Revert dev to staging (whoops)