Merge branch 'master' into develop
Update travis and package.json
update bower to ~1.3.8
Merge branch 'develop'