Squashed commit of the following:

commit 30158514bb64c83bf576dafc9aadc6af215c5eb9
Author: Damien Garbarino <damiengarbarinoibm@gmail.com>
Date:   Tue Aug 13 14:15:41 2013 +0200

    update calendar project