fixed #2
Merge branch 'feature/2-bower-config' into dev