organise file
Merge branch 'master' of git@github.com:jay3000bc/picletta.git

Conflicts:
	studio/fileupload.php
	studio/js/acordion-paging.js
	studio/new.html