Kegan Dougal b296d05b35 Fix finally NPE

2016-01-20 15:38:34 +00:00

..

structures

Fix finally NPE

2016-01-20 15:38:34 +00:00

views

Merge branch 'develop' into matthew/roompreview

2016-01-20 14:42:04 +00:00