Condensed all data into one json

Closes #13 and #7
Merge branch 'develop' of https://github.com/giulioungaretti/opendatahacklab2014 into develop