refactor
Merge branch 'master' into simon
Merge branch 'master' into simon
Added form paramaters to ajax request
added infoWindows and info to sidebar
fixed merge conflict
Merge branch 'master' of https://github.com/simdugas/childcare