Dev

Merged developer branch back into master, now that the 
development branch has become stable enough for usage 
in modern web browsers.