move doc into this folder
daily change
Merge branch 'dev' of https://github.com/shengyongjiang/sinoramaoa into dev

Conflicts:
	.idea/workspace.xml