Updated the project to remove errors introduced by Eclipse's auto import