Merge branch 'hotfix/bug_fix'
Added some additional debug code for tracking down the nullPointerException
Fixed the iconPath undefined javascript error
Merge branch 'hotfix/bug_fix' into develop