Updated to old version

Recommitting.
Merge branch

Conflicts:
	User_progress_page.php