Add content for merchants in the "Getting started" page
Merge pull request #263 from bitcoin/merchants

Add content for merchants in the "Getting started" page
Fix one typo
Update fr translation
Apply some small CSS fixes
Add missing img width/height for wallets' icons
Remove some trailing spaces
Add a mobile version of the "Choose your wallet" page
Fix inconsistent position of the mobile language select box
Remove Bitcoin Singapore conference
Create 2014-01-25-NABC.md
Merge pull request #272 from junior8k/patch-1

Create 2014-01-25-NABC.md
Fix two typos
Include more security advices in texts
Mention that wallets and payment requests must be secured
Mention that users should check for the reputation of merchants
Mention that dispute mediation services could exist in the future
Merge pull request #262 from bitcoin/merchantsecurity

Include more security advices in texts
Suspend BIPS display on bitcoin.org
(Service has been compromised and users have not been refunded)
Remove BIPS from wallets
(Their web wallet service is now closed)
Remove some additional html belonging to BIPS wallet
Update fr translation
Add Bitcoin expo 2014 conference
Add non-profit organizations to the community page
Merge pull request #276 from bitcoin/org

Add non-profit organizations to the community page