Added gittip badge
Merge branch 'master' into bug/fix.position.problems
Breaking down to file-level basis