Merge branch 'master' of /home/mimo/Dokumenty/Programovani/2013/tymak/Knihovna with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/code/local/Knihovna/Tituly/Model/Import.php
odstraneni blbosti
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
odstraneni blbosti
Merge remote-tracking branch 'origin/master'
pridani odkazu nahoru na seznam knih
Merge remote-tracking branch 'origin/master'