added image uploader
merged
Merge branch 'navinspm-master'