First cut
Merge remote-tracking branch 'oAuth2/master'

Conflicts:
	.gitignore
First cut