bug fix
Merge branch 'master' of https://github.com/elitecod3rs/comercio

Conflicts:
	viewproduct.php
Merge branch 'master' of https://github.com/elitecod3rs/comercio

Conflicts:
	dashboard.php