Need some help regarding HomeAutomation

I was doing my room automate via esp8266 with the help of relay , but a little problem I am facing,that when I switched on the light via relay then I cannot turn it off via switch board manually ,the switch is now useless & I have tried two way switch but it's not a better solution.
So please can anyone tell me how to solve this problem so that I can turn lights on manually & automatic too
Thanks

 

The wall switch needs to control the relay also.

 

How to do that without replacing the switch,any extra circuit need to add?

 

Post a schematic for what you have now.