bower components added
Merge branch 'develop'