Merge remote-tracking branch 'scott/master'
Merge remote-tracking branch 'scott/master'
Merge remote-tracking branch 'scott/master'
Merge remote-tracking branch 'paul/master'
Merge remote-tracking branch 'scott/master'
Preparing layout for area renderer
Merge remote-tracking branch 'paul/master'
Added config builder tab
Merge remote-tracking branch 'scott/master'
Merge branch 'master' of https://github.com/rodys009/mhcs
Merge remote-tracking branch 'scott/master'
Box config with ratios
Changing size of layout display
Added working jsonp import
fixed side by side view showing same side twice
Blank screen on tab switch
Layout working
Fixed typo
Merge remote-tracking branch 'scott/master'
Created MapControlPanel class to create buttons to fire events to move/zoom the map