app startup timeout is now configurable in dea.yml
Merge branch 'configurable_timeout' of git://github.com/simonleung8/dea_ng into simonleung8-configurable_timeout
Merge branch 'simonleung8-configurable_timeout'
Auto-merge remote-tracking branch 'upstream/master'