My own version
Merge branch 'master' of https://github.com/cdvcz/intranet

Conflicts:
	Gemfile.lock
Upravena sablona.
Upravena sablona.
Merge branch 'master' of https://github.com/cdvcz/intranet
Merge branch 'master' of https://github.com/cdvcz/intranet
Merge branch 'master' of https://github.com/cdvcz/intranet

Conflicts:
	Gemfile.lock