Merge pull request #1 from mpsenka/master

added our buttons and deleted theirs; put button in browser action
some changes
Merge pull request #2 from mpsenka/master

updated buttons
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
final