fix crash
Merge branch 'master' of github.com:stellar/stellard into inflation

Conflicts:
	src/ripple_rpc/impl/AccountFromString.cpp