log
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/logs/log-2014-12-05.php