twig 1.15 breaks things
update version of peyote
update testing to use phpunit.xml and run tests from the root of the code. Also now displaying a code coverage report
added disable_upload setting to allow turning the ability to add images off
corrected the mime type of api error messages, fixes the error messages displaying on the image upload page
corrected the mime type of api error messages, fixes the error messages displaying on the image upload page
forgot to remove debugging
easter egg
updates for media resource implementation
final changes to add media resources
missing sql updates from last commit
added orderBy clause
create missing thumbs from a list
added media/get and image/get implements it
Merge branch 'media'

Conflicts:
	js/add.js
removed theme code
removed refresh code
modified travis file locations
accidently a line
added media tests