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

Conflicts:
	projekt-compiler/src/backend/classfile/classfile_writer.cc
	projekt-compiler/src/backend/classfile/constant_pool.cc
	projekt-compiler/src/backend/classfile/constant_pool.h
Merge branch 'master' of https://github.com/ccebinger/SWPSoSe14
Editor ist verlorengegangen. Hier ist er wieder. Hoffentlich korrekte Revision.
Merge branch 'master' of https://github.com/ccebinger/SWPSoSe14