remove body from csv
click thumbnail to see image ! and gd extension test
gododonow
osef
osef
Merge branch 'next' of gitorious.org:elabftw/elabftw into next

Conflicts:
	TODO
osef
custom uploads dir
replace uploads/ by $ini_arr['upload_dir']
fix for lightbox when there is no images
add slash to example
no need for id in download.php
Merge branch 'master' of gitorious.org:elabftw/elabftw

Conflicts:
	inc/display_file.php
uploads stuff
better config-example
add extension to longfilename
fix \" in pdf creation
add print todo
fix reset-pass error messages
Merge branch 'master' of gitorious:elabftw/elabftw