Halfway through jvectormaps

WHAT IS THIS#$UI*$&*#@$
Merge remote-tracking branch 'origin/master'

Conflicts:
	animhist/animation.php