encoding problem
Merge remote-tracking branch 'origin/master' into v0_8

Conflicts:
	Gemfile
	Gemfile.lock
	locale/app.pot