Changement CSS (chinois -> normal) + google API
Merge branch 'master' of https://github.com/emoc11/P2016-E05-PHP

Conflicts:
	public/stylesheet/uandme.css