RESSERV-74 merge  with cleanup

commit f0fab2f141bb5537ddcfe1b78bba63850d644670
Author: James Wennmacher <jwennmacher@unicon.net>
Date:   Thu May 1 10:30:15 2014 -0700

    RESSERV-74 merge cleanup

commit f517823ebeae9ee2891d2cfba2c9ad9862b79812
Author: Jeff Sittler <mindblender@gmail.com>
Date:   Wed Apr 30 10:10:52 2014 -0700

    Adding namespaces theme

commit d959e8d6427688ae82936d1cc4c63538787eb5bb
Author: Jeff Sittler <mindblender@gmail.com>
Date:   Tue Apr 29 16:21:35 2014 -0700

    Rebuilt the css and JS front he bootstrap 3.1.1 tag instead off of master.

    Also, renamed the field to be more consistent with ResourceServer naming conventions

commit 6d049c500ecd63550226abad240c5bccf1badcfd
Author: Jeff Sittler <mindblender@gmail.com>
Date:   Fri Apr 18 14:12:04 2014 -0700

    Adding odified version of boostrap to fix a namespace issue and to put it in the bootstrap-namespaced directory

commit 34ce66f3ff9211284d663634a539fe3613712490
Author: Jeff Sittler <mindblender@gmail.com>
Date:   Fri Apr 18 13:56:24 2014 -0700

    Removing the bootstrap-custom directory and files

commit b537da1464364636d50491f1fc9531b31a6eac24
Author: Jeff Sittler <mindblender@gmail.com>
Date:   Tue Apr 1 10:58:28 2014 -0700

    Adding a custom version of bootstrap that has been namespaced with .bootstrap-styles