no message
Merge branch 'master' into suhas/newUI

* master:
  ui and other changes
  bug fixes to update leaf node count of root

Conflicts:
	res/layout/story_line_item.xml
no message
Merge pull request #6 from bvinodkr/suhas/newUI

Suhas/new ui