Merge branch 'master' of git://github.com/sharydow/ProjectTox-Website into sharydow-master

Conflicts:
	index.fr.json
Danish translation by TheFragen.
Merge https://github.com/TheFragen/ProjectTox-Website