First commit on 19/dec/2013

	modified:   php/class/company.php
	modified:   php/class/user.php
	modified:   php/class/validate.php
	new file:   php/controller/members/addcompany.php
	deleted:    php/controller/members/addcompany_admin.php
	renamed:    php/controller/members/admin_companylist.php -> php/controller/members/companylist.php
	modified:   php/controller/public/register.php
	modified:   php/view/addcompany_adminview.php
	modified:   php/view/companylist_adminview.php
	modified:   php/view/nav.php
Second commit on 19/dec/2013

	modified:   php/class/category.php
	modified:   php/controller/members/addcategory.php
	modified:   php/controller/members/addcompany.php
	modified:   php/controller/members/companylist.php
	new file:   php/controller/members/homepage_merchant.php
	modified:   php/controller/members/update.php
	modified:   php/controller/public/login.php
	modified:   php/controller/public/register.php
	modified:   php/view/addcategory_adminview.php
	modified:   php/view/addcompany_adminview.php
	modified:   php/view/adddeal_view.php
	modified:   php/view/login_form.php
	modified:   php/view/nav.php
	modified:   php/view/register_form.php
	modified:   php/view/update_view.php
Third commit on 19/dec/2013

	modified:   php/view/nav.php