Golf and rugby sevens have been voted on to the programme for the 2016 Olympic Games in Rio de Janeiro.