about to merger
Merge branch 'clean' of github.com:tmarrinan/WebSAGE into clean
fixed remote server