Page blog
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/logs/log-2014-10-28.php