git rm --cached settings.pyc __init__.pyc .idea/workspace.xml @home 2014-3-18 晚上
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	.idea/workspace.xml