Fix some password reset stuff.
Fix namespace.
Update package.json

gulp-if seems to be missing when calling mix.less in the Gulpfile
Change some method names.
Ignore node_modules
Update view.php
Merge pull request #3079 from mayoz/develop

Remove pagination config in view
Merge pull request #3078 from anvanza/patch-1

Update package.json
Shorten sentence.
Rename a few things.
Merge remote-tracking branch 'upstream/develop' into develop

Conflicts:
	app/Http/Controllers/Auth/AuthController.php
	app/User.php