Merge branch 'hotfix/cache-request'
Added "serve" target to Makefile

- abstracts using the built-in PHP web server
- allows setting port via an argument
Updated composer.phar
Merge branch 'feature/server' into develop