Add bower
Merge branch 'bower' into devel