merged/cherrypick from release
added ajax error handler; buttons now show 'loading' when fireing ajax calls

Conflicts:
	index.html