add context processors
Update image detail ligth box scale
Create README.md
add .gitignore
Merge branch 'master' of github.com:RobertUJ/vivilox_server

Mescla test de la rama
Merge branch 'develop'

Update directory system Add django folder parent of vivilox folder
Merge branch 'master' into develop

Conflicts:
	README.md
	vivilox/vivilox/apps/home/context_processors.py
	vivilox/vivilox/apps/home/context_processors.pyc
	vivilox/vivilox/settings.pyc
	vivilox/vivilox/templates/bases/main_base.html
	vivilox/vivilox/templates/store/image_details.html
	vivilox/vivilox/urls.pyc