7-commit
Merge branch 'master' of https://github.com/sharonning/timeline

Conflicts:
	timeline.php