some more work on image upload testing.. not really effective yet
Merge branch 'master' of github.com:sighmon/NI