Modified the function which draws the state bars to only update them after they have been created.
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	rest/src/main/webapp/client/js/functions.js
Moved the call to query state until after drawing the UI
Merge remote-tracking branch 'origin/develop' into develop