fixed fontello merge conflict
fixed fontello merge conflict

blocktrail/blocktrail-webwallet,blocktrail/blocktrail-webwallet,blocktrail/blocktrail-webwallet,blocktrail/blocktrail-webwallet,blocktrail/blocktrail-webwallet,blocktrail/blocktrail-webwallet