#49
Merge branch 'local_development' of https://github.com/Topart/new_production into local_development