Merge pull request #11 from gonzalovazquez/master

first release branch
pointer bower install to root
removed conflicted files