Merge branch 'master' into FixSomeFormatting

# Conflicts:
#	CHANGELOG.md
#	app/scripts/lib/notifications.js

1 files changed, 5 insertions, 0 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2ee7dc930..aa0eda9ce 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,7 +5,12 @@
 - Fixed bug where MetaMask interfered with PDF loading.
 - Moved switch account icon into menu bar.
 - Changed status shapes to be a yellow warning sign for failure and ellipsis for pending transactions.
+<<<<<<< HEAD
 - Fix formatting on terms & conditions page.
+=======
+- Now enforce 30 character limit on wallet names.
+
+>>>>>>> master
 
 ## 2.4.4 2016-06-23