fix merge conflict
Merge pull request #105 from Soundnode/develop

Fix bug when changed to about view. add code refactoring.