Merge pull request #571 from HackerWins/develop

Fix enter key bug.
Fix Recent Color bug on toolbar
Merge pull request #572 from snowfoxzx/master

Fix Recent Color bug on toolbar