better handling of non-existent IPS-data in week 1
code restructuring
more logging in zipreader
Merge branch 'master' of
https://github.com/nullbox/Data-and-Information-Visualization-Project.git

Conflicts:
	src/big/marketing/controller/DataController.java
	src/big/marketing/controller/MongoController.java