Added 'proxy' as an option for the base url
add dev proxy to lists of urls
Merge branch 'reingroot-gh-pages' into gh-pages