improved object and layer management
Merge branch 'master' of github.com:ariunbayar/fall

Conflicts:
	static/js/main.js