Update conventions.md
Merge branch 'next' of github.com:mmoadeli/MaidSafe-Vault into next
Merge remote-tracking branch 'upstream/account_transfer' into next
bug fixes
Merge pull request #80 from mmoadeli/MAID-BUG-FIX4

Maid bug fix4