user eclipse to manage git
Merge branch 'fw'