Added the new sql file for the database. As well as some changes to the admin permissions page.
Merge branch 'master' of https://github.com/xTriad/whiteboard

Conflicts:
	app/models/upload.rb