20130926
Merge branch 'master' of https://github.com/serious198706/DFCarCheckerProject

Conflicts:
	.idea/workspace.xml