Facebook Likes
Merge branch 'master' into Facebook_Like

Conflicts:
	public/scripts/entities/fbpost.js
Merge branch 'Facebook_Like'