Validate image upon upload
Merge branch 'develop' of github.com:praekelt/jmbo into develop