Fixed paths.
Updated bower path
Merge remote-tracking branch 'origin/master'