Move to Java 7 and diamond operator in carstore
Merge pull request #473 from ArcBees/ol_java7

Move to Java 7 and diamond operator in carstore