NOJIRA: Committing in current as-is state for Aron to take a look at and possibly modify.
Adding an Eclipse project file.
NOJIRA: Resolving merge conflict.