Fixed merge issue in file
Added CIListener project to project as dependency
Updated default AIR Flash Player target to 11.1 instead of 10.0.
Merged with master.