made it so if --auto-size-window is used in combination with --fullscreen it makes the window the size of the desktop
added freetype2 include dirs to Makefile
remove couchbase dependency from Makefile
made it so collision areas have their centers rotated around the centerpoint of the object
Merge remote-tracking branch 'upstream/master'