Merge branch 'dev' of dylansserver.com:dylansserver into dev