Merge pull request #35 from cdman/development

Merged with updates from upstream
Merge branch 'development' into udacity_skin--attila
feat(skin): add email during registration