- working with var promise
Merge commit '69c7b7a'

Conflicts:
	js/app.js