The default message was not clear

Added clarity
Updated line to use spaces instead of tabs.
Moved pre-update-cmd to post-update-cmd
Merge pull request #2332 from laheab/master

Move pre-update-cmd to post-update-cmd, solves inconveniences.
Add missing comma.
gitignore windows thumbnails
Merge pull request #2358 from JosephSilber/ignore-windows-thumbs

gitignore windows thumbnails
Merge pull request #2321 from ameech/patch-1

Updated line to use spaces instead of tabs.
Merge pull request #2311 from msurguy/patch-2

The default message was not clear
Merge remote-tracking branch 'upstream/master' into develop

Conflicts:
	.gitignore
	app/lang/en/reminders.php
	composer.json
	public/.htaccess