Merge branch 'dev' of https://github.com/shengyongjiang/sinoramaoa into dev

Conflicts:
	.idea/workspace.xml
ignore .idea directory
Merge branch 'dev' of https://github.com/shengyongjiang/sinoramaoa into dev

Conflicts:
	.idea/workspace.xml