Bower info
Merging develop