Merge pull request #674 from joshowen/master

Fix Avatar url for linkedin_oauth2
Added {% providers_media_js %} to example (closes #675)
Travis now uses official Django 1.6
ORCID support (closes #672).
Squashed commit of the following:

commit d8c48d405464f6ec1c4da21fc04ec13bce61af49
Author: Raymond Penners <raymond.penners@intenct.nl>
Date:   Fri Jul 25 19:39:11 2014 +0200

    Integrated ORCID support

commit 377669e6519f7e99e8bceee742ed3fd3796cc04e
Author: nimiq <puntonim@gmail.com>
Date:   Fri Jul 25 16:56:58 2014 +0200

    Fix provider name

commit b0242d78f2fc52af2c46c1dff854b4d110430f5e
Author: nimiq <puntonim@gmail.com>
Date:   Thu Jul 24 14:24:08 2014 +0200

    ORCID param read parsing the token response directly in complete_login()

commit fffbb6f9256168e42784f15214916201955b087e
Author: nimiq <puntonim@gmail.com>
Date:   Thu Jul 24 11:57:08 2014 +0200

    Fix tests

commit a1df019ff885cb3197585e6592057b0f8ff84a6a
Author: nimiq <puntonim@gmail.com>
Date:   Wed Jul 23 19:05:37 2014 +0200

    Add support for orcid.org
Provide license on PyPI page (closes #642)
Content-Security-Policy (closes #626)
Squashed commit of the following:

commit 440cb26a90a39347179e658692b26065ac15f298
Author: Raymond Penners <raymond.penners@intenct.nl>
Date:   Sat Jul 26 16:56:57 2014 +0200

    Integrated Content-Security-Policy related fix

commit d2a723972124959d52f6c23526aa008ae0e1c168
Author: andrean <andrean.franc@gmail.com>
Date:   Thu Jul 24 14:09:35 2014 +0200

    fix unittest of facebook provider

commit 6a4652798b60e19c81a57cc5146e0703390dfdf3
Author: andrean <andrean.franc@gmail.com>
Date:   Thu Jul 24 13:57:52 2014 +0200

    escape quotes of json parameters

commit 3d66ec3410cc7ea88ad5b959089003a6b7cfd439
Author: andrean <andrean.franc@gmail.com>
Date:   Thu Jul 24 13:34:23 2014 +0200

    fix #626 - content-security-policy issue with inline javascript used by the facebook provider
ORCID support: from Member API to Public API
OrcidAccount default print method uses user's uid
Merge pull request #679 from nimiq/orcid

ORCID support: from Member API to Public API
Render authentication error in case of state issue (closes #583)
Don't use username in password forgotten template (closes #515)
Test suite now includes Django 1.7
fix #589 ignore null values of first_name, last_name to generate username
use json.dumps instead of manually constructing json
in template (closes #677, closes #626)

Conflicts:
	allauth/socialaccount/providers/facebook/templates/facebook/fbconnect.html
Exclude Python 2.6 / Django 1.7 in Travis
PEP8 fixes
HTTPS Callback URL (closes #579)
Storing social access tokens is now optional (closes #665)
python3-openid-3.0.4 issue 'Association' object has no attribute
'getExpiresIn' (closes #597)
flickr requires https for api reqs