Merge branch 'master' of https://github.com/shilad/wikAPIdia into toby-changelivedao
start url integration
finished modifying LiveQueryAPI and QueryParser (pre-testing)
got new code working with LocalLinkLiveDao
Merge branch 'toby-changelivedao' of https://github.com/shilad/wikAPIdia into integrate_url_construction