testing merges from local
Merge branch 'master' of https://github.com/dbujak/SvetosavljeMVC4

Conflicts:
	Svetosavlje/Web/Svetosavlje/Views/Home/Crkvenoslovenski.cshtml
	Svetosavlje/Web/Svetosavlje/Views/Home/Molitve.cshtml
	Svetosavlje/Web/Svetosavlje/Views/Home/Pojanje.cshtml
	Svetosavlje/Web/Svetosavlje/Views/Home/Svetinje.cshtml