db update
Merge branch 'master' of https://github.com/vivekjoshi15/victorynettechnologies

Conflicts:
	classes/db.class.php