Rolling to test
Merge remote-tracking branch 'origin/dev' into test
Merge remote-tracking branch 'origin/dev' into test
Merge remote-tracking branch 'origin/dev' into test
Merge remote-tracking branch 'origin/dev' into test

Conflicts:
	package.json
Merge pull request #1 from liloQui/dev

Dev
Merge pull request #2 from liloQui/dev

Dev
External auth provider integration, tokens