Added page for changing password along with controller and route
Merge branch 'master' of github.com:guardian/frontend into id-change-password

* 'master' of github.com:guardian/frontend:
  Optimisations in MatchController
  fixing block slot generation
  Fix broken build of Identity...
  Remove match link from match tables
  Adding magic match URLs
removed some labels
Match commercial components by keyword

Using a comparable format.
Add keywords to match bestsellers by
Chris Finch's styling for the profile upload, but nothing more
Add support for uploading Avatars [#IDN-1774]

Allows users to upload new Avatars for their profile:

https://profile.thegulocal.com/public/edit

The avatars are sent for moderation in the Discussion tool, so they're not
available immediately.

The Avatar upload system we're hooking into /could/ be described as
legacy. The fact that it uses GAE is not the problem, the dependency on
the Guardian DocRoot (rather than S3) is closer to the mark.

https://jira.gutools.co.uk/browse/IDN-1774
https://sites.google.com/a/guardian.co.uk/discussion-project/
https://sites.google.com/a/guardian.co.uk/discussion-project/avatars/avatar-upload
Let avatar switch show up on switches page
Change layout of profile form
Add extra old password field and link other fields correctly
Merge branch 'master' into id-change-password

Conflicts:
	identity/conf/routes
Take top 5 matching bestsellers
Merge branch 'master' into id-change-password
add googfc to allowable query strings
style badge slot
add observer inline branding
Merge remote-tracking branch 'origin/master' into observer-link
Start adding group stuff
add switch for sponsored badges
Match day now added to football extras