Merge branch 'T-Reader' into Facebook
fixed drawEdges()
Merge branch 'Facebook'
Merge remote-tracking branch 'origin/master' into T-Reader