Merge branch 'release/3.3.1' into develop
remove gitignore in bower manifest
Merge branch 'release/3.3.1'