merged with upstream master
fixes Issue #611 by letting an admin destroy and update a user
updated translations from google docs
merged with upstream master, updated to rails 3.2.14 and reverted English translations
fixes Issue #610 by creating an admin section for each resource
artist and recording have previews for updates to exisiting records
can now apply changes to artists and recordings
finishes Issue #360 by allowing a user to create a new resource based off of a preview
adds reporting to resources for Issue #359
resolves Issue #610 by taking out the extra info and adding a warning depending up the type of resource being destroyed
resolves Issue #611 by adding in the tabs to the show page for administration of users and edit and destroy links on the index page
fixes Issue #625 by adding in missing keys that were in en but not in fr
Feature #610 - fixing the visual so the buttons show below the tabs and not above them
fixes Issue #360 by not destroying old wiki links before setting new wiki links so you can now see a preview, in memory, without touching the database
fixes Issue #359 by adjusting the email content and adding an email notice after submitition
Merge branch 'master' of github.com:HangingClowns/KiungoWiki
gave a link to access the admin pages from the site content