Merge pull request #10 from ipri2013/master

Updating my fork
Merge pull request #11 from ipri2013/master

Updating my fork, almost done
Merge pull request #12 from ipri2013/master

Updating my fork
vpisna bugfix, database ready for presentation
database ready for presentation
lastbug:)?
Merge pull request #64 from nejc92/master

lastbug:)?