Merge branch 'master' into styling
Merge branch 'master' into styling
calendar update with js
update with rails style guide