bower resolved
Merge branch 'tests'