Merge pull request #33 from olivier-squid/master

Bower+Grunt
Revert "Bower+Grunt"
Merge pull request #34 from squidsolutions/revert-33-master

Revert "Bower+Grunt"