Ghoula mid work
ui - mid work
Merge branch 'master' of https://github.com/israellevin/otp

Conflicts:
	templates/index.html
Merge branch 'master' of https://github.com/israellevin/otp

Conflicts:
	templates/index.html
Clean after aborted commit.
Merge branch 'master' of https://github.com/israellevin/otp

Conflicts:
	static/otp.js
	templates/index.html