APD-146: Fix recursive problems with $(window).bind('statechange'
Remove whitespaces
Merge branch 'APD-146-BOZ' into develop