20141205
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/libraries/support_annotations_20_0_0.xml
	.idea/misc.xml
	.idea/workspace.xml
	Around-The-Truck-Customer.iml
sumin's modification