dynamic render res
Merge remote-tracking branch 'upstream/master' into merging_branch

Conflicts:
	js/main.js
Made it run after the merge.
Adding back motion blur.