Updated German translation
Merge remote-tracking branch 'upstream/master'

Conflicts:
	translations/phototonic_de.ts
Merge remote-tracking branch 'upstream/master'

Conflicts:
	translations/phototonic_de.ts
Merge remote-tracking branch 'upstream/master'
Updated German translation
Merge pull request #144 from JHooverman/master

Updated German translation