promiss and route manager fixes
Merge branch 'master' of https://github.com/creatdenoi/asdep

Conflicts:
	app/index.html