Added bower support (merge from master and touch)