dynamic image size
Merge branch 'develop' of http://github.com/ben-bougher/pickr into develop
merged and fixed