vps
vps
Merge branch 'develop' of https://github.com/duxan/exhibitions into develop
Merge branch 'develop' of https://github.com/duxan/exhibitions into develop
Merge branch 'develop' of https://github.com/duxan/exhibitions into develop

Conflicts:
	application/logs/errors.log