ignore some files for bower installs
Merge remote-tracking branch 'origin/develop' into develop
bump version
update changelog
Merge branch 'release/v1.2.1'