Laptop Changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	models/AFBadgeBuilder.php