merge XPages for 901 (based on XPages Demo App ver.2.0.1)