.
.
Merge branch 'development'

Conflicts:
	api/add_comment.php