08/26/2013 PLarzoid

Fixed initial errors, trying to work on Capital Palette page
Merge remote-tracking branch 'origin/develop-webapp'
08/26/2013 Plarzoid

Working Capital Palette page!
Merge remote-tracking branch 'origin/master'