Merge remote-tracking branch 'origin/master'

Conflicts:
	src/IC/Parser/IC.lex
	src/IC/Parser/Library.cup