Tony Tam 6675568d09 merged from develop

2014-09-18 21:26:04 -07:00

..

main

merged from develop

2014-09-18 21:26:04 -07:00

test

renamed discoveryUrl to url to match js change

2013-07-08 23:53:05 -07:00