init
Merge branch 'master' of https://github.com/black-night/mozilo-1.12-FotoGalerie

Conflicts:
	README.md
init