Cleaned up code for Scrutinizer
Merge branch 'master' of https://github.com/magabriel/bolt

Conflicts:
	app/extensions/FacebookLike/extension.php
	app/extensions/TwitterButton/extension.php