Merge branch 'master' of https://github.com/anastasia/pandocker

Conflicts:
	.gitignore
Merge branch 'master' of github.com:anastasia/pandocker
add - bower install as a postinstall script
Merge pull request #7 from stites/npm

bower install after npm install