Updated a few version numbers. Added automatic injection in custom views
Code clean up.