Merge pull request #15 from vadhawal/master

parent category as all should result in subcategory as all
few bug fixes related to profile images
Merge remote-tracking branch 'upstream/master'