Merge branch 'master' into develop
add bower as npm dev dependency
add travis config
small fix
update travis comfig file
Merge branch 'develop'