Pre-final 2

Trying to merge 'facebook' with 'master' branch.
Conflict resolution
Conflict resolution 2

Conflicts:
	js/fb.js
	js/stickers.js