hanged in local
gerge branch 'amit' of https://github.com/bishups/pcc-main into amit

Conflicts:
	db/load_pincode.rb