Update
update gitignore
Merge branch 'master' of github.com:pulpitum/auth

Conflicts:
	.gitignore
	.travis.yml
	composer.json
	phpunit.xml
	public/.gitkeep
	src/Pulpitum/Auth/AuthServiceProvider.php
	src/config/.gitkeep
	src/controllers/.gitkeep
	src/controllers/Admin/GroupsController.php
	src/controllers/Admin/MessagesController.php
	src/controllers/Admin/PermissionsController.php
	src/controllers/Admin/UsersController.php
	src/controllers/IndexController.php
	src/filters.php
	src/lang/.gitkeep
	src/lang/pt/core.php
	src/lang/pt/form.php
	src/lang/pt/messages.php
	src/migrations/.gitkeep
	src/models/Exceptions/Permissions.php
	src/models/Master/Groups.php
	src/models/Master/Messages.php
	src/models/Master/Permissions.php
	src/models/Master/Users.php
	src/models/Values/User.php
	src/routes.php
	src/views/.gitkeep
	src/views/emails/change_password.php
	src/views/emails/new_account.php
	src/views/emails/newmessage.php
	src/views/emails/recover.php
	src/views/emails/reset.php
	src/views/login.php
	src/views/message.php
	src/views/partials/groups.php
	src/views/partials/permissions.php
	src/views/recover.php
	src/views/reset.php
	src/views/user.php
	tests/.gitkeep
fix
fix