Revert "258-D2: Cannot re-select countries"

This reverts commit f09e6408e9ba9e1cfde3ecfdef5b604f04f1ccca.
258-D1 & 258-D2 : Almost done - minor bug fixed
Modifying the Build number HTML in order to test the server github fetch script
258-D1 and 258-D2 : further improvements
258-D1 and 258-D2 : After resolving conflicts