created image/merge and resource/merge
return url and thumbnail on the image/merge method
now requiring PHP5.4 as some of it's syntax is being used
cleaned up the admin pages a bit
fixed image admin page
admin UI for merging, plus random code cleanup
fix external comments link on info page
admin merge page
admin merge page
massive refactor. No longer passing arrays to methods. Using reflection to map API to method calls
fixed tag/all
Merge branch 'reflect'
improvements to open-graph info
hide social buttons if "show_social" is set to 0
added php docblocks to most of the code
added internal API docs
increase the menu bar slightly to make it easier to use on a touchscreeen device
Merge branch 'master' into stable