Added dynamically changing icons

New icon, changed icon.png to icon_on.png, updated manifest.json, added
new function in background.js to turn on/off blocking which changes a
variable and icon
Merge branch 'master' of https://github.com/Somesingman/PennApps_Fall_2014

Conflicts:
	popup.html
	popup.js