added new menu in error.tpl
Fixed bug in edit profile link
Merge branch 'master' into ada-api

Conflicts:
	browsing/main_index.php