guice and templating
Merge branch 'master' of github.com:guillaumecle/omxcontrol

Conflicts:
	src/main/java/com/cguillaume/omxcontrol/Main.java
	src/main/java/com/cguillaume/omxcontrol/Omx.java