Add to commut
i
Add to commut
i
Add to commut
i
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/scripts/directives/photoGalleryEdit.ts
	app/styles/Profile.css
Add to commut
i