added CFR and other stuff. This is the code used for AAAI'15 submission