Migrated to java 1.7
Merge remote-tracking branch 'origin/master'