Bower

Updated from master