Update: 0.3.1
Update: 0.3.1
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/model/translate.class.php