Merge branch 'John'
Merge branch 'John'
Merge branch 'John'
Merge branch 'John'
fbutton action changes

fbutton action changes
Merge branch 'master' into John

Conflicts:
	js/main.js