init
Merge branch 'master' of github.com:ospfranco/PhotoFR2

init merge