progress
Merge branch 'master' of https://github.com/hubinglei/DMCS

Conflicts:
	Prototype/DMCSPages/css/global.css