..
------
123
Merge branch 'master' of https://github.com/vjerch/TN

Conflicts:
	NinjaSoftware.TrzisteNovca/Views/Home/TrgovanjeDan.cshtml