Editor: waypoints support added
Level.js merged
Merging done