Merge pull request #3 from ipri2013/master

Update
Zacetek izgleda
Merge remote-tracking branch 'origin/master'
Zacetek izgleda
Merge pull request #19 from nedroid/master

Bootstrap, GoogleMaps, Calendar,...