Improved replacement ofimage by data binding
Merge branch 'master' of https://github.com/eiurur/zoi

Conflicts:
	public/js/controllers.js