changes
Added country when registering
add upload percent and fixed upload
Merge branch 'master' into Nir

Conflicts:
	JS/studioJoin.js
	JS/uploadPanel.js
	studioJoin.php
fixed join
merged branches