Fixed bug in includes and supported old and new decking.json format