DESKTOP
DESKTOP MERGA

Conflicts:
	appengine_server/war/js/common.js
	appengine_server/war/js/mobile2.js
	web_tests/src/RichPageTest.java