Improve i18n strings
Preparation for grunt pot generation
Update POT
Remove space before string
Fix further strings
Update pot
Added new background option.
Merge branch 'origin/master'

Conflicts:
	functions.php