Merge branch 'master' into paik
Merge branch 'master' into paik
Changed chat room name to Persian_Paik_Chat
Remove font from Paik
Merge pull request #10 from N-Pex/paik_npex

Remove font from Paik
Merge pull request #11 from N-Pex/paik

Merging latest from master.
Merge branch 'master' into paik
Merge branch 'paik' of https://github.com/guardianproject/securereader into paik
Merge remote-tracking branch 'origin' into paik
Paik specific values
Merge branch 'master' into paik
Changed content provider authorities to be unique
Merge branch 'master' into paik