added new menu in error.tpl
Fixed bug in edit profile link
method date_to_ts can now take time as an optional second parameter
Fixed bug in add_course.php now it warns the user if the code course is duplicated.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	browsing/main_index.php
Fixed bug in add_lservice.php now it warns the user if the code course is duplicated.
Merge branch 'master' into holis_test-2
Merge remote-tracking branch 'origin/holis_test' into holis_test-2