Added Javadoc documentation style to LocationModel
Merge branch 'test' of https://github.com/CMPUT301W14T10/Team-10-Project-W2014 into test