Cleaned main.js
Merge branch 'develop' of https://github.com/giulioungaretti/opendatahacklab2014 into develop

Conflicts:
	website/js/main.js