Handle css problem with BASE_URL defined as a global variable
Merge branch 'devRemi'