solved image upload bug
fixed conflicts from chibuzor
View edited
Merge branch 'develop' of https://github.com/betkom/i-Vent into develop