Combined cabindata with some basic weather place data
Chenged the weather place model to be a sub class of the place model
Merge branch 'master' of https://github.com/Quasineation/cabinwebproject.git