Ignoring Eclipse .settings folder
Merge branch 'master' into pb_menu_retry
Retrying menu (wip)