Merge branch 'hotfix/0.0.1_facebook_id_fix'
Merge branch 'master' of https://github.com/RobertBentinck/PronounceThis into feature/database_redesign