First commit from IntelliJ. Removed eclipse files.
Merge remote-tracking branch 'origin/master'