adding loading gif
Merge branch 'loading' into dev

Conflicts:
	js/client/main.css