Added Calculator Module
Merge branch 'master' of https://github.com/nunull/QuickStarter.git

Conflicts:
	src/de/dqi11/quickStarter/modules/CalculatorModule.java
Merge branch 'master' of https://github.com/nunull/QuickStarter.git

Conflicts:
	src/de/dqi11/quickStarter/controller/MainController.java
Wiki Module