merging master into develop
fixed bower.json conflict