changed import, now uses 1.7 instead of 1.8, using english because
github hates special characters.
Merge remote-tracking branch 'origin/master'
don't know