Merge pull request #5 from FilipNikolovski/master

Admin panel i index.aspx merge
Merge pull request #18 from FrosinaS/master

Sliki