elpa-update
Merge branches 'master' and 'master' of https://github.com/osamu2001/elpa

Conflicts:
	archives/gnu/archive-contents
	archives/marmalade/archive-contents
	archives/melpa/archive-contents