database
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
Register page redirect bug, joomla users model and save from pendingstarlink, selectproducts on pendingstarlink, fix newstoregister bug