merge
merge master
select error
bower edit
function bug
addNewProduct
api added
rm
new provider added