making the spikes appear above the walls
manually resolving merge conflict
Changed default language from JavaScript to Python. Fixed a few InventoryView tests. Adjusted maze real-time playback speed factor code.
Merge branch 'master' into production