Fixed the merging issue.
Added the Image Slide Show.
Added bootstrap image gallery implementation.
Added more GUI changes for bootstrap slide show
Fixed the merging issue
Merge branch 'master' of https://github.com/rpillai/PhotoGallery2

Conflicts:
	PhotoGallery2/Controllers/AlbumController.cs
	PhotoGallery2/Controllers/PhotoController.cs
	PhotoGallery2/PhotoGallery2.csproj
	PhotoGallery2/Views/Photo/Edit.cshtml
	PhotoGallery2/Web.config