Code sync with master
Update bower components