paginator
conf.json.default
Merge pull request #3 from lhenze/master

Arabic text for about page
Merge remote-tracking branch 'upstream/master'

Conflicts:
	source/sass/style.scss