fix merge
Merge branch 'master' of https://github.com/ccebinger/SWPSoSe14

Conflicts:
	projekt-compiler/src/backend/unittest/constant_pool_test.cc
	projekt-compiler/src/main.cpp
Merge branch 'master' of https://github.com/ccebinger/SWPSoSe14
Merge branch 'master' of https://github.com/ccebinger/SWPSoSe14
Merge branch 'master' of https://github.com/ccebinger/SWPSoSe14

Conflicts:
	projekt-compiler/src/main.cpp
Merge branch 'master' of https://github.com/ccebinger/SWPSoSe14