Newest version from dev with @Inject annotations
Update .gitignore
Merge pull request #1 from sgraf812/master

Newest version from dev with @Inject annotation and javadocs