bug fixes to update leaf node count of root
ui and other changes
merge from trunk
Merge branch 'master' of github.com:bvinodkr/goodorbad

# By Vinod Balakrishnan (1) and anurag16 (1)
# Via anurag16
* 'master' of github.com:bvinodkr/goodorbad:
  ui and other changes
  bug fixes to update leaf node count of root

Conflicts:
	res/layout/fragment_story_line.xml
	res/layout/story_line_item.xml
	res/layout/treenode_item.xml
	src/com/example/goodbad/fragments/StoryLineListFragment.java
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