Merge branch 'dev' into mia_dev
Merge branch 'dev' into mia_dev
rm image/ and empty dir
organize css/js files
update files related images changes
add a calendar
Merge branch 'mia_dev' into dev