Merge branch 'ready-rewards' of github.com:stellar/stellar-client
text change
Merge branch 'master' of github.com:stellar/stellar-client
Fix broken iconfont (leading globs don't work, whoops)
Cache txt promises correctly
Add issuer contact if present
Merge pull request #597 from stellar/fix-federation

Fix federation
Fixed bug when accesing transaction.amount on transactions type rippling
Fix typo for "business insider"
Merge pull request #599 from stellar/fix-news-spelling

Fix typo for "business insider"
adding back to dashboard link
adding icons to the nav so settings link is more obvious
fix email setting padding issue & add lines for better visual guides
for icons to fade out
Merge pull request #601 from stellar/tidy-settings

Tidy settings
Merge pull request #598 from guillelopez/fix-bug-when-adding-issuer-to-contacts

Fixed bug when accesing transaction.amount on transactions type rippling
let's not promise when just yet
Merge branch 'master' of github.com:stellar/stellar-client into invites

Conflicts:
	app/index.html
	app/styles/main.scss
	app/templates/facebook-button.html