Misc updates. Couldn't figure out the changes. (forgotton somehow)
Merge branch 'master' of https://github.com/rebornix/delta

Conflicts:
	src/app/app.js