Local Commit
Local Commit
Merge branch 'master' of https://github.com/rpillai/PhotoGallery2

Conflicts:
	PhotoGallery2/Controllers/ServerConstants.cs
	PhotoGallery2/Views/Photo/Index.cshtml
committed local changes
committed local changes
Merge branch 'master' of https://github.com/rpillai/PhotoGallery2
Committed local changes
Auto commit
Merge branch 'master' of https://github.com/rpillai/PhotoGallery2

Conflicts:
	PhotoGallery2/Migrations/201405270645204_InitialCreate.cs
	PhotoGallery2/Migrations/201405282132020_Initial-Create.cs
	PhotoGallery2/Migrations/201406011236568_Comment table changes.resx
	PhotoGallery2/Migrations/201406050300141_InitialCreate.cs
	PhotoGallery2/PhotoGallery2.csproj
	PhotoGallery2/Views/Account/Login.cshtml
	PhotoGallery2/Views/Account/Manage.cshtml
	PhotoGallery2/Views/Account/Register.cshtml
	PhotoGallery2/Views/Home/About.cshtml
	PhotoGallery2/Views/Home/Contact.cshtml
	PhotoGallery2/Views/Photo/Details.cshtml
	PhotoGallery2/Views/Photo/ListPhotos.cshtml
	PhotoGallery2/Views/Photo/_DetailView.cshtml
Fixed the url issue for the local deployments and added global functions for delete
Merge branch 'master' of https://github.com/rpillai/PhotoGallery2

Conflicts:
	PhotoGallery2/Scripts/PhotoGallery/StartSlideShow.js
	PhotoGallery2/Scripts/_references.js
	PhotoGallery2/Views/Photo/Details.cshtml
	PhotoGallery2/Views/Photo/Index.cshtml
	PhotoGallery2/Views/Photo/Manage.cshtml
Merge branch 'master' of https://github.com/rpillai/PhotoGallery2

Conflicts:
	PhotoGallery2/Controllers/PhotoController.cs
	PhotoGallery2/Scripts/_references.js
	PhotoGallery2/Views/Photo/Manage.cshtml
	PhotoGallery2/Views/Photo/_ListPhotos.cshtml