comment stage 2
Merge remote-tracking branch 'origin/master'

Conflicts:
	js/ajax.js
	timeline.php