upgrade packages
upgrade packages
Merge branch 'tmp' into dev

Conflicts:
	.gitignore
	elpa/archives/marmalade/archive-contents
	elpa/archives/melpa/archive-contents