begin version 2.0
Merge branch 'master' of https://github.com/eliath/Juicys-Gallery

Conflicts:
	.gitignore