Merge branch 'develop'
Merge branch 'develop'
update bower.json
Merge branch 'develop' of github.com:dbeff/frontendler into develop