Merge branch 'master' of https://github.com/epikur90/sw14_xp_05

Conflicts:
	.idea/misc.xml
	.idea/modules.xml

Signed-off-by: stefan3010 <stefan.maggale@student.tugraz.at>