update contact information
update diary
Merge branch 'master' of https://github.com/lants1/ch.bfh.bti7081.s2013.green.git