Merged components and bower_components

Merged components and bower_components and removed components directory
Revert "Merged components and bower_components"

This reverts commit e16b4899444751db174401c13d1c847838551f3a.
Merge branch 'master' into testing