Angular
resolving remote latency
Merge branch 'master' into gh-pages

Conflicts:
	js/views/global/global.js