Contect script FIXED!
~merge~

Conflicts:
	appengine_server/war/client/contentscript.js