Fix all errors.
push up eclipse formatter
Merge remote-tracking branch 'upstream/master'
Format code again + organize imports