Email address
Merge branch 'master' into brr-branch

* master:
  Email address

Conflicts:
	GitTraining/Base.lproj/Main.storyboard