Amarinder Singh to Join BJP