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

Conflicts:
	.gitignore
add - angular / node handshake done; file gets sent, converted, zipped, sent back
Merge branch 'master' of github.com:anastasia/pandocker
add - bower install as a postinstall script
add - semicolons, renamed service, returning object from service
fix - service is calling its own method now, not a directive\'s from god knows where
Merge pull request #6 from anastasia/fixingGit

add - angular / node handshake done; file gets sent, converted, zipped, ...
Merge pull request #7 from stites/npm

bower install after npm install
Merge branch 'master' of github.com:anastasia/pandocker into frontend-upload

Conflicts:
	public/app.js
	public/features/upload/partial.html
	public/main.css
Merge branch 'frontend-upload' of github.com:stites/pandocker into frontend-upload

Conflicts:
	public/app.js
	public/main.css