Add code style formator (for eclipse)
Merge commit '71dc3685b9c3f8bdea6ee4ef153038ee6976d4a4'
Eclipse format and clean up