try catch for db
Merge remote-tracking branch 'origin/master'

Conflicts:
	Webstore/index.php