shop activation
shop activation cont
merge

Conflicts:
	dashboard.php