added code formatter template, don't forget to enable eclipse save actions
Merge remote-tracking branch 'origin/master'