Merge pull request #1 from WebThriftStore/wts-develop

Wts develop
update gitignore
fixing grunt file issue
Merge pull request #2 from EladElrom/wts-develop

wts-develop