Merge branch 'master' into develop
Update README.
Moved Bower files.
Merge branch 'develop'