updated to java 7
Merge pull request #28 from gdfm/java7

updated to java 7
Merge pull request #6 from yahoo/master

Jmockit
Fix for issue#30 - Improve initialization of randomizer

Because it is independent of the id, the randomizer can be initialized
outside of "onCreate" method. This is less error-prone.
Avoid checking license for target/ folder
Updated DistributedClustering
Merge pull request #32 from matthieumorel/issue30

Fix for issue#30 - Improve initialization of randomizer
Merge pull request #35 from abifet/master

Fix for issue#33: Solved paralelization problem in DistributedClustering
Merge pull request #34 from gdfm/license_fix

Avoid checking license for target/ folder
Merge branch 'entranceprocessor' of github.com:gdfm/samoa into gdfm-entranceprocessor

Conflicts:
	samoa-api/src/main/java/com/yahoo/labs/samoa/streams/ClusteringSourceProcessor.java