Merge branch 'master' into develop
Update .gitignore for adding dist directory
Update bower.json for ignoring dist directory
Merge branch 'develop'