Changes to wcs, apps, and template
Merge branch 'master' of github.com:nimsothea/wcs