link names changed on navbar
Merge remote-tracking branch 'origin/master'

Conflicts:
	templates/master_template.php
	views/ads/ads_list.php
fixed ads index container