add bower
Merge branch 'refs/heads/master' into gh-pages

Conflicts:
	.gitignore
delete libs
update index