Merge branch 'master' into f_oauth2

Conflicts:
	.gitignore
Merge branch 'f_oauth2' into f_passport