Fixed #49
Merge branch 'master' into parser
Unneccessary stuff :-P
Merge branch 'master' into parser

Conflicts:
	code/semanticAnalyzer/src/swp_compiler_ss13/fuc/semantic_analyser/SemanticAnalyser.java
Introduced OpAssociativity
Merge branch 'master' into parser