Update master
Update master
Merge remote-tracking branch 'upstream/master'

Conflicts:
	VERSION.txt
Updated Dutch translations
Merge pull request #12 from remyw/master

Updated Dutch translation