roboguice stuff...
roboguice
Merge branch 'refs/heads/4_roboguice' into develop