/ nove licence
Merge branch 'master' of github.com:arezz/spac_web

Conflicts:
	web/_docs/seznam_licenci_2013.xls