In-time commit
Merge remote-tracking branch 'origin/master' into maaak

Conflicts:
	BinaryStudio.PhotoGallery.Web/Controllers/PhotoController.cs
HOTFIX