Writer changes.
Data loader changes.
Merge branch 'master' of https://github.com/rwiturralde/HubwayHackathon

Conflicts:
	src/appContext.xml
Changes for Writer / Loader.
Merge branch 'master' of https://github.com/rwiturralde/HubwayHackathon

Conflicts:
	src/appContext.xml
Fixing merge conflicts.