Fixed bug when loading data on startup
Merge branch 'master' of https://github.com/carlphilipp/Chicago-Tracker

Conflicts:
	ChicagoTracker/AndroidManifest.xml
	ChicagoTracker/assets/update.txt
	ChicagoTracker/src/fr/cph/chicago/activity/MainActivity.java