Version 0.2
Merge branch 'master' of https://github.com/philippkrehl/BA

Conflicts:
	serverSide/httpServer.js
Version 0.2