hiding or in header if no parent C
Merge remote-tracking branch 'upstream/master'
adding favicon image
error icon for birthday
Merge pull request #249 from vadhawal/master

favicon.. hiding "or" in header if no parent category.
Merge pull request #250 from saumishr/master

Integration with mainline.