test + changes
Merge branch 'master' of https://github.com/Karatekiwi/lsdc.git

Conflicts:
	src/src/at/ac/tuwien/lsdc/ss2013/entities/HighPerformanceApplication.java
	src/src/at/ac/tuwien/lsdc/ss2013/entities/WebApplication.java
	src/src/at/ac/tuwien/lsdc/ss2013/inputfilegenerator/InputFileReader.java