add file
add file
Merge branch 'master' of file:////home/tomasi/Dropbox/www/Gallery01

Conflicts:
	app/detect.php
	smartphone/404.php
	smartphone/about.php
	smartphone/css/camera.css
	smartphone/css/style.css
	smartphone/images/logo.png