Plugin update
Language update
Update
Merge remote-tracking branch 'upstream/master'

Conflicts:
	http/index.php
Merge pull request #22 from mariogrip/master

Update