save state (iframe url) in case app crashes
fixed merge in app.js

Conflicts:
	app/app.js