Merge refactor/bower into dev/2.0.0