image picker evolved
fixed boxselect bug
fixed mask bug
Merge branch 'master' into newmask

Conflicts:
	www/app.html