Merge pull request #2 from zapiski/master

Update
Merge pull request #1 from zapiski/master

updejt
Merge pull request #8 from dockiler/master

Merge pull request #1 from zapiski/master
Merge pull request #9 from Osebek/master

Merge pull request #2 from zapiski/master
Merge pull request #3 from zapiski/master

Bootstrap
Merge pull request #2 from zapiski/master

Updejt
Merge pull request #10 from rokkolesa/master

Merge pull request #2 from zapiski/master
views
Merge pull request #11 from dockiler/views

Views
Merge pull request #13 from Osebek/master

Merge pull request #3 from zapiski/master
Merge pull request #14 from rokkolesa/master

Nekej
Merge pull request #3 from zapiski/master

Views