Merge pull request #1 from CSSS2013UrbanMobility/Juste's-branch

Removed copyrighted articles/test pull request-merge
Merge pull request #2 from CSSS2013UrbanMobility/master

Conflicting merge