fix devserver
Merge missing files
Deploy at 2014-09-08-10:01:39 by erik
Merge develop - Deploy at 2014-09-08-10:01:39 by erik