08/21/2013 Plarzoid

Fixed some bugs found in testing.
Renamed some tabs, and their corresponding templates so the names more accurately reflect purpose.
Moved some tabs around in the order on the page.
Merge remote-tracking branch 'origin/develop-webapp' into develop-webapp