Merge branch 'master' into gyarab

# Conflicts:
#	SOC-DOKUMENTACE.pdf
#
# It looks like you may be committing a merge.
# If this is not correct, please remove the file
#	.git/MERGE_HEAD
# and try again.


# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
#
# On branch gyarab
# Your branch is up to date with 'origin/gyarab'.
#
# All conflicts fixed but you are still merging.
#
