Added DAO layer v1.1
Merge origin/master
Merge origin/master
Added /locodata.json controller