Merge pull request #63 from ironjan/develop

Issue #59
Added missing @EBean annotation
Added many TODOs to see where the code needs cleanup etc
Added travis integration and merged conflicts